subject:"\[5\/6\] cassandra git commit\: Merge branch 'cassandra\-3.0' into cassandra\-3.11"

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

2018-12-20 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 08363afa5354c00a7ecd62fe273c392a678db28a
Parents: 27c53b5 23d722e
Author: Marcus Eriksson 
Authored: Thu Dec 20 13:41:48 2018 +0100
Committer: Marcus Eriksson 
Committed: Thu Dec 20 13:41:48 2018 +0100

--
 build.xml | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08363afa/build.xml
--
diff --cc build.xml
index c9565f8,7e85991..8fefd17
--- a/build.xml
+++ b/build.xml
@@@ -1174,31 -1130,8 +1174,28 @@@

  
  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +
- 
-   
- 

  
  
  
-   
+   
 -  
 -  
 -  
 +
 +  
 +
 +  
 +  
 +
 +  
 +  Failed to set File Separator. This shouldn't 
happen.
 +
 +  
 +  
 +  
 +  
 +  
  

  


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-12-06 Thread samt

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 8961246dba280dbb7a6d2807bc8c25e00d78dd29
Parents: d502165 1104361
Author: Sam Tunnicliffe 
Authored: Thu Dec 6 16:15:16 2018 +
Committer: Sam Tunnicliffe 
Committed: Thu Dec 6 16:15:16 2018 +

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 60 +---
 .../org/apache/cassandra/db/ReadCommand.java|  6 +-
 .../cassandra/thrift/CassandraServer.java   | 10 ++--
 4 files changed, 49 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8961246d/CHANGES.txt
--
diff --cc CHANGES.txt
index d774f6d,4520989..57d493b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,6 +1,8 @@@
 -3.0.18
 +3.11.4
 + * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 - * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
   * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8961246d/src/java/org/apache/cassandra/db/LegacyLayout.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8961246d/src/java/org/apache/cassandra/db/ReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8961246d/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index c148777,163eb2d..444a938
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -2459,8 -2426,8 +2459,8 @@@ public class CassandraServer implement
  for (int i = 0 ; i < request.getColumn_slices().size() ; i++)
  {
  fixOptionalSliceParameters(request.getColumn_slices().get(i));
- ClusteringBound start = LegacyLayout.decodeBound(metadata, 
request.getColumn_slices().get(i).start, true).bound;
- ClusteringBound finish = LegacyLayout.decodeBound(metadata, 
request.getColumn_slices().get(i).finish, false).bound;
 -Slice.Bound start = LegacyLayout.decodeSliceBound(metadata, 
request.getColumn_slices().get(i).start, true).bound;
 -Slice.Bound finish = LegacyLayout.decodeSliceBound(metadata, 
request.getColumn_slices().get(i).finish, false).bound;
++ClusteringBound start = 
LegacyLayout.decodeSliceBound(metadata, 
request.getColumn_slices().get(i).start, true).bound;
++ClusteringBound finish = 
LegacyLayout.decodeSliceBound(metadata, 
request.getColumn_slices().get(i).finish, false).bound;
  
  int compare = metadata.comparator.compare(start, finish);
  if (!request.reversed && compare > 0)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-30 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f77936d80c7a419838a0c2a57687051e62345a7d
Parents: 1017fe0 0c97908
Author: Benedict Elliott Smith 
Authored: Fri Nov 30 12:13:07 2018 +
Committer: Benedict Elliott Smith 
Committed: Fri Nov 30 12:13:07 2018 +

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-29 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 1017fe0d8a49365e730a13ec9d851a127d1462a4
Parents: e635317 e4d0ce6
Author: Jason Brown 
Authored: Thu Nov 29 10:47:32 2018 -0800
Committer: Jason Brown 
Committed: Thu Nov 29 10:50:36 2018 -0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/transport/Message.java | 16 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/CHANGES.txt
--
diff --cc CHANGES.txt
index 965d945,d63016b..b853ab0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.18
 +3.11.4
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
   * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/src/java/org/apache/cassandra/transport/Message.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-29 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: e635317cf8816fc8f130afc479bfd57a6cd7
Parents: 1084ad9 8404260
Author: Benedict Elliott Smith 
Authored: Thu Nov 29 15:56:40 2018 +
Committer: Benedict Elliott Smith 
Committed: Thu Nov 29 15:56:40 2018 +

--
 CHANGES.txt|  1 +
 .../org/apache/cassandra/db/rows/AbstractRow.java  |  7 ++-
 .../org/apache/cassandra/db/rows/BTreeRow.java | 16 +---
 src/java/org/apache/cassandra/db/rows/Row.java | 17 -
 .../cassandra/db/rows/UnfilteredSerializer.java|  8 
 .../apache/cassandra/cql3/GcCompactionTest.java|  2 +-
 .../validation/entities/SecondaryIndexTest.java| 16 
 .../db/SinglePartitionSliceCommandTest.java|  2 +-
 8 files changed, 50 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e635317c/CHANGES.txt
--
diff --cc CHANGES.txt
index c228e8f,40016a1..965d945
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.18
 +3.11.4
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
   * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
   * Throw exception if Columns serialized subset encode more columns than 
possible (CASSANDRA-14591)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e635317c/src/java/org/apache/cassandra/db/rows/AbstractRow.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e635317c/src/java/org/apache/cassandra/db/rows/BTreeRow.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e635317c/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
--
diff --cc src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
index c74f756,0342e39..926f3ef
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
@@@ -226,41 -180,24 +226,41 @@@ public class UnfilteredSerialize
  if ((flags & HAS_DELETION) != 0)
  header.writeDeletionTime(deletion.time(), out);
  
 -if (!hasAllColumns)
 +if ((flags & HAS_ALL_COLUMNS) == 0)
- Columns.serializer.serializeSubset(Collections2.transform(row, 
ColumnData::column), headerColumns, out);
+ Columns.serializer.serializeSubset(row.columns(), headerColumns, 
out);
  
  SearchIterator si = 
headerColumns.iterator();
 -for (ColumnData data : row)
 +
 +try
  {
 -// We can obtain the column for data directly from data.column(). 
However, if the cell/complex data
 -// originates from a sstable, the column we'll get will have the 
type used when the sstable was serialized,
 -// and if that type have been recently altered, that may not be 
the type we want to serialize the column
 -// with. So we use the ColumnDefinition from the "header" which 
is "current". Also see #11810 for what
 -// happens if we don't do that.
 -ColumnDefinition column = si.next(data.column());
 -assert column != null;
 +row.apply(cd -> {
 +// We can obtain the column for data directly from 
data.column(). However, if the cell/complex data
 +// originates from a sstable, the column we'll get will have 
the type used when the sstable was serialized,
 +// and if that type have been recently altered, that may not 
be the type we want to serialize the column
 +// with. So we use the ColumnDefinition from the "header" 
which is "current". Also see #11810 for what
 +// happens if we don't do that.
 +ColumnDefinition column = si.next(cd.column());
 +assert column !=

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

2018-11-28 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4a531c27ce04e880f72feb49879d1cf6c2ee4b1d
Parents: 64d828b f7630e4
Author: Blake Eggleston 
Authored: Wed Nov 28 09:13:56 2018 -0800
Committer: Blake Eggleston 
Committed: Wed Nov 28 09:13:56 2018 -0800

--
 CHANGES.txt |  1 +
 .../db/rows/RowAndDeletionMergeIterator.java| 40 +++-
 .../rows/RowAndDeletionMergeIteratorTest.java   | 48 
 3 files changed, 80 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a531c27/CHANGES.txt
--
diff --cc CHANGES.txt
index 5fbd53e,6e18de1..ebcf1b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.18
 +3.11.4
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
   * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
   * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
   * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a531c27/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a531c27/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java
index e4c04fb,dd88704..2f48000
--- 
a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java
+++ 
b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java
@@@ -342,8 -349,31 +347,30 @@@ public class RowAndDeletionMergeIterato
  assertFalse(iterator.hasNext());
  }
  
 -
+ /**
+  * RTL doesn't correctly merge range tombstones in some situations (see 
CASSANDRA-14894)
+  */
+ @Test
+ public void testWithNoopBoundaryMarkers()
+ {
+ PartitionUpdate update = new PartitionUpdate(cfm, dk, 
cfm.partitionColumns(), 1);
+ RangeTombstoneList rtl = new RangeTombstoneList(cfm.comparator, 10);
+ rtl.add(rt(1, 2, 5, 5));
+ rtl.add(rt(3, 4, 5, 5));
+ rtl.add(rt(5, 6, 5, 5));
+ rtl.add(rt(0, 8, 6, 6)); // <- supersedes all other tombstones
+ 
+ Assert.assertEquals(3, rtl.size());
+ 
+ try (UnfilteredRowIterator partition = 
createMergeIterator(update.iterator(), rtl.iterator(), false))
+ {
+ assertRtMarker(partition.next(), 
ClusteringPrefix.Kind.INCL_START_BOUND, 0);
+ assertRtMarker(partition.next(), 
ClusteringPrefix.Kind.INCL_END_BOUND, 8);
+ assertFalse(partition.hasNext());
+ }
+ }
  
 -private void assertRtMarker(Unfiltered unfiltered, Bound bound)
 +private void assertRtMarker(Unfiltered unfiltered, 
ClusteringBoundOrBoundary bound)
  {
  assertEquals(Unfiltered.Kind.RANGE_TOMBSTONE_MARKER, 
unfiltered.kind());
  assertEquals(bound, unfiltered.clustering());


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-28 Thread samt

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 64d828b9dee1d05a09e54dfbff9d4a612d5ace22
Parents: 54be1fa 0a7fbee
Author: Sam Tunnicliffe 
Authored: Wed Nov 28 16:11:08 2018 +
Committer: Sam Tunnicliffe 
Committed: Wed Nov 28 16:11:08 2018 +

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/LegacyLayout.java   |  33 +-
 ...bles-legacy_ka_14912-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../legacy_tables-legacy_ka_14912-ka-1-Data.db  | Bin 0 -> 102 bytes
 ...gacy_tables-legacy_ka_14912-ka-1-Digest.sha1 |   1 +
 ...legacy_tables-legacy_ka_14912-ka-1-Filter.db | Bin 0 -> 16 bytes
 .../legacy_tables-legacy_ka_14912-ka-1-Index.db | Bin 0 -> 36 bytes
 ...cy_tables-legacy_ka_14912-ka-1-Statistics.db | Bin 0 -> 4474 bytes
 ...egacy_tables-legacy_ka_14912-ka-1-Summary.db | Bin 0 -> 80 bytes
 .../legacy_tables-legacy_ka_14912-ka-1-TOC.txt  |   8 ++
 .../cassandra/io/sstable/LegacySSTableTest.java | 103 +--
 11 files changed, 137 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/CHANGES.txt
--
diff --cc CHANGES.txt
index 1503e3f,0d33e3c..5fbd53e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.18
 +3.11.4
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
   * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
   * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
   * Sstable min/max metadata can cause data loss (CASSANDRA-14861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/src/java/org/apache/cassandra/db/LegacyLayout.java
--
diff --cc src/java/org/apache/cassandra/db/LegacyLayout.java
index c697a8d,c80594c..8bd2114
--- a/src/java/org/apache/cassandra/db/LegacyLayout.java
+++ b/src/java/org/apache/cassandra/db/LegacyLayout.java
@@@ -24,8 -24,8 +24,9 @@@ import java.nio.ByteBuffer
  import java.security.MessageDigest;
  import java.util.*;
  
+ import org.apache.cassandra.cql3.ColumnIdentifier;
  import org.apache.cassandra.cql3.SuperColumnCompatibility;
 +import org.apache.cassandra.config.SchemaConstants;
  import org.apache.cassandra.utils.AbstractIterator;
  import com.google.common.collect.Iterators;
  import com.google.common.collect.Lists;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index e065a06,4d99081..baa2b46
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@@ -36,21 -35,19 +35,20 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  import org.apache.cassandra.SchemaLoader;
 +import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.cql3.QueryOptions;
+ import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.ColumnDefinition;
  import org.apache.cassandra.cql3.QueryProcessor;
  import org.apache.cassandra.cql3.UntypedResultSet;
- import org.apache.cassandra.cql3.statements.SelectStatement;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
- import org.apache.cassandra.db.ReadExecutionController;
- import org.apache.cassandra.db.SinglePartitionReadCommand;
  import org.apache.cassandra.db.SinglePartitionSliceCommandTest;
  import org.apache.cassandra.db.compaction.Verifier;
- import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
+ import org.apache.cassandra.db.marshal.BytesType;
+ import org.apache.cassandra.db.marshal.SetType;
+ import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.db.rows.RangeTombstoneMarker;
  import org.apache.cassandra.db.rows.Unfiltered;
- import org.apache.cassandra.db.rows.UnfilteredRowIterator;
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.dht.Token;


-
To unsubscribe, e-mail:

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

2018-11-18 Thread ifesdjeen

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 78c7d57ebb28ac688cd287d7d8b8f483a99d0135
Parents: 2ed7c6a c6f822c
Author: Alex Petrov 
Authored: Mon Nov 19 08:52:59 2018 +0100
Committer: Alex Petrov 
Committed: Mon Nov 19 08:52:59 2018 +0100

--
 src/java/org/apache/cassandra/dht/Range.java| 27 +++--
 .../org/apache/cassandra/dht/RangeTest.java | 40 
 2 files changed, 63 insertions(+), 4 deletions(-)
--


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

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-17 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2ed7c6a6b8f747806b2dfa8e9919582306ed6522
Parents: 5431b87 60a8cfe
Author: Blake Eggleston 
Authored: Sat Nov 17 16:01:39 2018 -0800
Committer: Blake Eggleston 
Committed: Sat Nov 17 16:01:39 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ed7c6a6/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java
--
diff --cc test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java
index 1bdbcb2,ca0dfa5..97855a6
--- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java
+++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java
@@@ -404,11 -395,11 +404,11 @@@ public class SinglePartitionSliceComman
  SelectStatement stmt = (SelectStatement) 
QueryProcessor.parseStatement(q).prepare(ClientState.forInternalCalls()).statement;
  
  List unfiltereds = new ArrayList<>();
- SinglePartitionReadCommand.Group query = 
(SinglePartitionReadCommand.Group) stmt.getQuery(QueryOptions.DEFAULT, 
FBUtilities.nowInSeconds());
+ SinglePartitionReadCommand.Group query = 
(SinglePartitionReadCommand.Group) stmt.getQuery(QueryOptions.DEFAULT, 0);
  Assert.assertEquals(1, query.commands.size());
  SinglePartitionReadCommand command = 
Iterables.getOnlyElement(query.commands);
 -try (ReadOrderGroup group = ReadOrderGroup.forCommand(command);
 - UnfilteredPartitionIterator partitions = 
command.executeLocally(group))
 +try (ReadExecutionController controller = 
ReadExecutionController.forCommand(command);
 + UnfilteredPartitionIterator partitions = 
command.executeLocally(controller))
  {
  assert partitions.hasNext();
  try (UnfilteredRowIterator partition = partitions.next())


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-13 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 5431b87ede5f2b41fc0d6b9775ca5256de211d92
Parents: a03424e 9eee7aa
Author: Aleksey Yeshchenko 
Authored: Tue Nov 13 15:30:56 2018 +
Committer: Aleksey Yeshchenko 
Committed: Tue Nov 13 15:30:56 2018 +

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/Serializers.java|   3 ++
 ...bles-legacy_ka_14873-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../legacy_tables-legacy_ka_14873-ka-1-Data.db  | Bin 0 -> 232 bytes
 ...gacy_tables-legacy_ka_14873-ka-1-Digest.sha1 |   1 +
 ...legacy_tables-legacy_ka_14873-ka-1-Filter.db | Bin 0 -> 16 bytes
 .../legacy_tables-legacy_ka_14873-ka-1-Index.db | Bin 0 -> 118 bytes
 ...cy_tables-legacy_ka_14873-ka-1-Statistics.db | Bin 0 -> 4446 bytes
 ...egacy_tables-legacy_ka_14873-ka-1-Summary.db | Bin 0 -> 92 bytes
 .../legacy_tables-legacy_ka_14873-ka-1-TOC.txt  |   8 
 .../cassandra/io/sstable/LegacySSTableTest.java |  38 +++
 11 files changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/CHANGES.txt
--
diff --cc CHANGES.txt
index 83e8b08,3284250..1503e3f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.18
 +3.11.4
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
   * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
   * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
   * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/src/java/org/apache/cassandra/db/Serializers.java
--
diff --cc src/java/org/apache/cassandra/db/Serializers.java
index d6aac64,bf340e7..02c9995
--- a/src/java/org/apache/cassandra/db/Serializers.java
+++ b/src/java/org/apache/cassandra/db/Serializers.java
@@@ -114,8 -79,11 +114,11 @@@ public class Serializer
  if (clusteringSize == 0)
  return Clustering.EMPTY;
  
+ if (metadata.isCompound() && CompositeType.isStaticName(bb))
+ return Clustering.STATIC_CLUSTERING;
+ 
  if (!metadata.isCompound())
 -return new Clustering(bb);
 +return Clustering.make(bb);
  
  List components = CompositeType.splitName(bb);
  byte eoc = CompositeType.lastEOC(bb);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-12 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d17836dec7ed9bd1aebb7ad9f369c7ab26317e31
Parents: af600c7 a270ee7
Author: Marcus Eriksson 
Authored: Mon Nov 12 09:46:03 2018 +0100
Committer: Marcus Eriksson 
Committed: Mon Nov 12 09:46:03 2018 +0100

--
 CHANGES.txt| 1 +
 .../cassandra/db/compaction/TimeWindowCompactionStrategy.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d17836de/CHANGES.txt
--
diff --cc CHANGES.txt
index f923fa0,d9eb316..e07099a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
   * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
   * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
   * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-06 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7eecf891f5a12a0f74b69a9aa60a91f584235d0c
Parents: a6a9dce e04efab
Author: Blake Eggleston 
Authored: Tue Nov 6 11:59:49 2018 -0800
Committer: Blake Eggleston 
Committed: Tue Nov 6 11:59:49 2018 -0800

--
 .../io/sstable/metadata/MetadataCollector.java| 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eecf891/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index a618c96,437d80f..0ac5187
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@@ -273,8 -272,11 +274,11 @@@ public class MetadataCollector implemen
  
  public Map finalizeMetadata(String 
partitioner, double bloomFilterFPChance, long repairedAt, SerializationHeader 
header)
  {
- Preconditions.checkState(comparator.compare(maxClustering, 
minClustering) >= 0);
+ Preconditions.checkState((minClustering == null && maxClustering == 
null)
+  || comparator.compare(maxClustering, 
minClustering) >= 0);
+ ByteBuffer[] minValues = minClustering != null ? 
minClustering.getRawValues() : EMPTY_CLUSTERING;
+ ByteBuffer[] maxValues = maxClustering != null ? 
maxClustering.getRawValues() : EMPTY_CLUSTERING;
 -Map components = Maps.newHashMap();
 +Map components = new 
EnumMap<>(MetadataType.class);
  components.put(MetadataType.VALIDATION, new 
ValidationMetadata(partitioner, bloomFilterFPChance));
  components.put(MetadataType.STATS, new 
StatsMetadata(estimatedPartitionSize,
   
estimatedCellPerPartitionCount,


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-11-06 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a6a9dce157a4ed14e7d08e854c504423dd199daa
Parents: 69f8cc7 d60c783
Author: Blake Eggleston 
Authored: Tue Nov 6 11:17:47 2018 -0800
Committer: Blake Eggleston 
Committed: Tue Nov 6 11:19:04 2018 -0800

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/db/Slice.java |  25 +-
 .../cassandra/io/sstable/format/Version.java|   2 +
 .../io/sstable/format/big/BigFormat.java|   9 ++
 .../io/sstable/metadata/MetadataCollector.java  |  25 +++---
 .../io/sstable/metadata/StatsMetadata.java  |  14 ++-
 .../mc-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
 .../mc-1-big-Data.db| Bin 0 -> 65 bytes
 .../mc-1-big-Digest.crc32   |   1 +
 .../mc-1-big-Filter.db  | Bin 0 -> 16 bytes
 .../mc-1-big-Index.db   | Bin 0 -> 8 bytes
 .../mc-1-big-Statistics.db  | Bin 0 -> 4789 bytes
 .../mc-1-big-Summary.db | Bin 0 -> 56 bytes
 .../mc-1-big-TOC.txt|   8 ++
 .../db/SinglePartitionSliceCommandTest.java |  87 +++
 .../cassandra/io/sstable/LegacySSTableTest.java |  34 +++-
 16 files changed, 166 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6a9dce1/CHANGES.txt
--
diff --cc CHANGES.txt
index 03abb5b,0fb1b86..f923fa0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
   * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
   * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
   * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6a9dce1/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index e61f4b3,f48d0a6..a618c96
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@@ -19,8 -19,8 +19,9 @@@ package org.apache.cassandra.io.sstable
  
  import java.nio.ByteBuffer;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Collections;
 +import java.util.EnumMap;
  import java.util.List;
  import java.util.Map;
  
@@@ -93,8 -95,8 +97,8 @@@ public class MetadataCollector implemen
  protected double compressionRatio = NO_COMPRESSION_RATIO;
  protected StreamingHistogram.StreamingHistogramBuilder 
estimatedTombstoneDropTime = defaultTombstoneDropTimeHistogramBuilder();
  protected int sstableLevel;
- protected ByteBuffer[] minClusteringValues;
- protected ByteBuffer[] maxClusteringValues;
 -private ClusteringPrefix minClustering = Slice.Bound.TOP;
 -private ClusteringPrefix maxClustering = Slice.Bound.BOTTOM;
++private ClusteringPrefix minClustering = ClusteringBound.TOP;
++private ClusteringPrefix maxClustering = ClusteringBound.BOTTOM;
  protected boolean hasLegacyCounterShards = false;
  protected long totalColumnsSet;
  protected long totalRows;
@@@ -277,7 -271,8 +273,8 @@@
  
  public Map finalizeMetadata(String 
partitioner, double bloomFilterFPChance, long repairedAt, SerializationHeader 
header)
  {
+ Preconditions.checkState(comparator.compare(maxClustering, 
minClustering) >= 0);
 -Map components = Maps.newHashMap();
 +Map components = new 
EnumMap<>(MetadataType.class);
  components.put(MetadataType.VALIDATION, new 
ValidationMetadata(partitioner, bloomFilterFPChance));
  components.put(MetadataType.STATS, new 
StatsMetadata(estimatedPartitionSize,

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

2018-10-23 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6308fb21da9ef512e8620779efb68b49f277484d
Parents: 075f458 e07d53a
Author: Aleksey Yeshchenko 
Authored: Tue Oct 23 23:27:09 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Tue Oct 23 23:27:09 2018 +0100

--
 build.xml   |  33 +
 .../utils/memory/LongBufferPoolTest.java| 614 ---
 2 files changed, 411 insertions(+), 236 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6308fb21/build.xml
--
diff --cc build.xml
index ff1695b,d7e6c4b..c9565f8
--- a/build.xml
+++ b/build.xml
@@@ -1399,7 -1345,15 +1399,15 @@@
  

  
+   
+   
+ 
+   
+ 
+   
 -  
 +  
  
  



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-10-16 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 075f4586231f2481bfc9f7d10a0e04784b281fc3
Parents: 4e6eb9a 285153f
Author: Blake Eggleston 
Authored: Tue Oct 16 12:48:38 2018 -0700
Committer: Blake Eggleston 
Committed: Tue Oct 16 12:48:38 2018 -0700

--
 CHANGES.txt |   1 +
 .../columniterator/SSTableReversedIterator.java | 118 +++
 ...acted_multi_block_rt-ka-4-CompressionInfo.db | Bin 0 -> 43 bytes
 ...acy_ka_compacted_multi_block_rt-ka-4-Data.db | Bin 0 -> 17848 bytes
 ...ka_compacted_multi_block_rt-ka-4-Digest.sha1 |   1 +
 ...y_ka_compacted_multi_block_rt-ka-4-Filter.db | Bin 0 -> 176 bytes
 ...cy_ka_compacted_multi_block_rt-ka-4-Index.db | Bin 0 -> 303 bytes
 ..._compacted_multi_block_rt-ka-4-Statistics.db | Bin 0 -> 4490 bytes
 ..._ka_compacted_multi_block_rt-ka-4-Summary.db | Bin 0 -> 92 bytes
 ...acy_ka_compacted_multi_block_rt-ka-4-TOC.txt |   8 ++
 ...ushed_multi_block_rt-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 ...egacy_ka_flushed_multi_block_rt-ka-1-Data.db | Bin 0 -> 17569 bytes
 ...y_ka_flushed_multi_block_rt-ka-1-Digest.sha1 |   1 +
 ...acy_ka_flushed_multi_block_rt-ka-1-Filter.db | Bin 0 -> 16 bytes
 ...gacy_ka_flushed_multi_block_rt-ka-1-Index.db | Bin 0 -> 306 bytes
 ...ka_flushed_multi_block_rt-ka-1-Statistics.db | Bin 0 -> 4478 bytes
 ...cy_ka_flushed_multi_block_rt-ka-1-Summary.db | Bin 0 -> 92 bytes
 ...egacy_ka_flushed_multi_block_rt-ka-1-TOC.txt |   8 ++
 .../cassandra/io/sstable/LegacySSTableTest.java |  26 
 19 files changed, 140 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/075f4586/CHANGES.txt
--
diff --cc CHANGES.txt
index d02226e,78c0c47..d28ba32
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
   * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
   * Reverse order reads can return incomplete results (CASSANDRA-14803)
   * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/075f4586/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--
diff --cc 
src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index f5094a5,2d95dab..82f358b
--- 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@@ -165,21 -157,30 +167,30 @@@ public class SSTableReversedIterator ex
  {
  if (!hasNext())
  throw new NoSuchElementException();
- return iterator.next();
+ Unfiltered next = iterator.next();
+ mostRecentlyEmitted = next;
+ return next;
  }
  
 -protected boolean stopReadingDisk()
 +protected boolean stopReadingDisk() throws IOException
  {
  return false;
  }
  
+ // checks if left prefix precedes right prefix
+ private boolean precedes(ClusteringPrefix left, ClusteringPrefix 
right)
+ {
+ return metadata().comparator.compare(left, right) < 0;
+ }
+ 
  // Reads the unfiltered from disk and load them into the reader 
buffer. It stops reading when either the partition
  // is fully read, or when stopReadingDisk() returns true.
 -protected void loadFromDisk(Slice.Bound start,
 -Slice.Bound end,
 +protected void loadFromDisk(ClusteringBound start,
 +ClusteringBound end,
- boolean includeFirst,
  boolean hasPreviousBlock,
- boolean hasNextBlock) throws IOException
+ boolean hasNextBlock,
+ ClusteringPrefix currentFirstName,
+ ClusteringPrefix nextLastName) throws 
IOException
  {
  // start != null means it's the block covering the beginning of 
the slice, so it has to be the last block for this slice.
  assert start == null ||

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

2018-10-16 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4e6eb9a32763ca76f95c230c6368b0e9b2f3aa52
Parents: 9afd3a5 5e969e9
Author: Aleksey Yeshchenko 
Authored: Tue Oct 16 17:12:53 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Tue Oct 16 17:12:53 2018 +0100

--
 CHANGES.txt |  2 +-
 .../cassandra/db/PartitionRangeReadCommand.java | 14 +-
 .../org/apache/cassandra/db/ReadCommand.java| 10 ++--
 .../db/SinglePartitionReadCommand.java  | 43 --
 .../UnfilteredRowIteratorWithLowerBound.java|  9 ++--
 .../cassandra/db/transform/RTBoundCloser.java   | 16 +++
 .../db/transform/RTBoundValidator.java  | 27 +--
 .../db/transform/RTTransformationsTest.java | 48 ++--
 8 files changed, 124 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e6eb9a3/CHANGES.txt
--
diff --cc CHANGES.txt
index 0607528,6ca14a0..d02226e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
- 3.0.18
+  * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
   * Reverse order reads can return incomplete results (CASSANDRA-14803)
   * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
   * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e6eb9a3/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e6eb9a3/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index 8bcfcbc,0135d1e..f475eb9
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -37,7 -35,7 +37,8 @@@ import org.apache.cassandra.db.partitio
  import org.apache.cassandra.db.rows.*;
  import org.apache.cassandra.db.transform.RTBoundCloser;
  import org.apache.cassandra.db.transform.RTBoundValidator;
+ import org.apache.cassandra.db.transform.RTBoundValidator.Stage;
 +import org.apache.cassandra.db.transform.StoppingTransformation;
  import org.apache.cassandra.db.transform.Transformation;
  import org.apache.cassandra.dht.AbstractBounds;
  import org.apache.cassandra.index.Index;
@@@ -419,12 -408,13 +420,13 @@@ public abstract class ReadCommand exten
  Tracing.trace("Executing read on {}.{} using index {}", 
cfs.metadata.ksName, cfs.metadata.cfName, index.getIndexMetadata().name);
  }
  
 -UnfilteredPartitionIterator iterator = (null == searcher) ? 
queryStorage(cfs, orderGroup) : searcher.search(orderGroup);
 +UnfilteredPartitionIterator iterator = (null == searcher) ? 
queryStorage(cfs, executionController) : searcher.search(executionController);
+ iterator = RTBoundValidator.validate(iterator, Stage.MERGED, false);
  
  try
  {
 +iterator = withStateTracking(iterator);
- iterator = withoutPurgeableTombstones(iterator, cfs);
+ iterator = 
RTBoundValidator.validate(withoutPurgeableTombstones(iterator, cfs), 
Stage.PURGED, false);
 -
  iterator = withMetricsRecording(iterator, cfs.metric, 
startTimeNanos);
  
  // If we've used a 2ndary index, we know the result already 
satisfy the primary expression used, so

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e6eb9a3/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 13e1dbe,4c8e0bc..ed98e28
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -39,7 -36,7 +39,8 @@@ import org.apache.cassandra.db.lifecycl
  import org.apache.cassandra.db.filter.*;
  import org.apache.cassandra.db.partitions.*;
  import org.apache.cassandra.db.rows.*;
+ import org.apache.cassandra.db.transform.RTBoundValidator;
 +import org.apache.cassandra.db.transform.Transformation;
  import org.apache.cassandra.exceptions.RequestExecutionException;
  import

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

2018-10-04 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 70303563e9796ccc87581f5d41071b624872815e
Parents: c7e6eee ab0e30e
Author: Blake Eggleston 
Authored: Thu Oct 4 12:56:39 2018 -0700
Committer: Blake Eggleston 
Committed: Thu Oct 4 12:56:39 2018 -0700

--
 CHANGES.txt |   2 +
 .../columniterator/SSTableReversedIterator.java |  40 +--
 ...bles-legacy_ka_14803-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../legacy_tables-legacy_ka_14803-ka-1-Data.db  | Bin 0 -> 16555 bytes
 ...gacy_tables-legacy_ka_14803-ka-1-Digest.sha1 |   1 +
 ...legacy_tables-legacy_ka_14803-ka-1-Filter.db | Bin 0 -> 16 bytes
 .../legacy_tables-legacy_ka_14803-ka-1-Index.db | Bin 0 -> 206 bytes
 ...cy_tables-legacy_ka_14803-ka-1-Statistics.db | Bin 0 -> 4450 bytes
 ...egacy_tables-legacy_ka_14803-ka-1-Summary.db | Bin 0 -> 92 bytes
 .../legacy_tables-legacy_ka_14803-ka-1-TOC.txt  |   8 
 .../cassandra/io/sstable/LegacySSTableTest.java |  20 ++
 11 files changed, 59 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/CHANGES.txt
--
diff --cc CHANGES.txt
index dfc0eeb,3c6d3b5..0607528
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,7 @@@
 +3.11.4
 +Merged from 3.0:
+ 3.0.18
+  * Reverse order reads can return incomplete results (CASSANDRA-14803)
   * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
   * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
   * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-09-28 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c7e6eee58d0ef207224a24fe0d99507f1af06771
Parents: c34a0f5 30d2835
Author: Marcus Eriksson 
Authored: Fri Sep 28 12:54:08 2018 +0200
Committer: Marcus Eriksson 
Committed: Fri Sep 28 12:54:08 2018 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/index/SecondaryIndexManager.java  |  5 ++-
 .../apache/cassandra/index/CustomIndexTest.java | 32 
 3 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e6eee5/CHANGES.txt
--
diff --cc CHANGES.txt
index 20cec87,70b2996..dfc0eeb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
   * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
   * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
   * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)

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

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-09-25 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c34a0f5207d228a2b78f6295cd4ab3e0755e56c2
Parents: 4d3f5a3 d496dca
Author: Aleksey Yeshchenko 
Authored: Tue Sep 25 17:41:10 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Tue Sep 25 17:41:10 2018 +0100

--
 CHANGES.txt |   1 +
 .../db/rows/RangeTombstoneBoundaryMarker.java   |   4 +-
 .../db/partitions/PurgeFunctionTest.java| 297 +++
 3 files changed, 300 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a0f52/CHANGES.txt
--
diff --cc CHANGES.txt
index a4fa705,2c2f4f5..20cec87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
   * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
   * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
   * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a0f52/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a0f52/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java
--
diff --cc test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java
index 000,1dea7f3..7f85aea
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java
+++ b/test/unit/org/apache/cassandra/db/partitions/PurgeFunctionTest.java
@@@ -1,0 -1,294 +1,297 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package org.apache.cassandra.db.partitions;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.Iterator;
+ import java.util.function.Predicate;
+ 
+ import com.google.common.collect.Iterators;
+ import org.junit.Before;
+ import org.junit.Test;
+ 
+ import org.apache.cassandra.config.CFMetaData;
++import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.db.ClusteringPrefix.Kind;
+ import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.marshal.AbstractType;
+ import org.apache.cassandra.db.marshal.UTF8Type;
+ import org.apache.cassandra.db.rows.*;
+ import org.apache.cassandra.db.transform.Transformation;
+ import org.apache.cassandra.dht.Murmur3Partitioner;
+ import org.apache.cassandra.utils.FBUtilities;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ 
+ import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
+ 
+ public final class PurgeFunctionTest
+ {
+ private static final String KEYSPACE = "PurgeFunctionTest";
+ private static final String TABLE = "table";
+ 
+ private CFMetaData metadata;
+ private DecoratedKey key;
+ 
+ private static UnfilteredPartitionIterator 
withoutPurgeableTombstones(UnfilteredPartitionIterator iterator, int gcBefore)
+ {
+ class WithoutPurgeableTombstones extends PurgeFunction
+ {
+ private WithoutPurgeableTombstones()
+ {
+ super(iterator.isForThrift(), FBUtilities.nowInSeconds(), 
gcBefore, Integer.MAX_VALUE, false, false);
+ }
+ 
+ protected Predicate getPurgeEvaluator()
+ {
+ return time -> true;
+ }
+ }
+ 
+ return Transformation.apply(iterator, new

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

2018-09-25 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4d3f5a32b2cc821f74fbece183ededdd91d195bf
Parents: 4f30dae 45937de
Author: Aleksey Yeshchenko 
Authored: Tue Sep 25 17:03:57 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Tue Sep 25 17:03:57 2018 +0100

--
 CHANGES.txt |   1 +
 .../cassandra/db/UnfilteredDeserializer.java| 115 ---
 ...bles-legacy_ka_14766-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../legacy_tables-legacy_ka_14766-ka-1-Data.db  | Bin 0 -> 103 bytes
 ...gacy_tables-legacy_ka_14766-ka-1-Digest.sha1 |   1 +
 ...legacy_tables-legacy_ka_14766-ka-1-Filter.db | Bin 0 -> 16 bytes
 .../legacy_tables-legacy_ka_14766-ka-1-Index.db | Bin 0 -> 134 bytes
 ...cy_tables-legacy_ka_14766-ka-1-Statistics.db | Bin 0 -> 4450 bytes
 ...egacy_tables-legacy_ka_14766-ka-1-Summary.db | Bin 0 -> 92 bytes
 .../legacy_tables-legacy_ka_14766-ka-1-TOC.txt  |   8 ++
 .../cassandra/io/sstable/LegacySSTableTest.java |  27 -
 11 files changed, 112 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/CHANGES.txt
--
diff --cc CHANGES.txt
index f04cae1,43628b2..a4fa705
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
   * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
   * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)
   * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-09-20 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4f30dae1d4fcd2ff84dd6d88e18f28509d95d392
Parents: 287a960 322f7e9
Author: Benedict Elliott Smith 
Authored: Thu Sep 20 14:21:23 2018 +0100
Committer: Benedict Elliott Smith 
Committed: Thu Sep 20 14:21:23 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f30dae1/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-09-14 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2725d5035d149e35f267029d10db6b5471041fce
Parents: 0aca1b9 9be4370
Author: Marcus Eriksson 
Authored: Fri Sep 14 08:43:29 2018 +0200
Committer: Marcus Eriksson 
Committed: Fri Sep 14 08:43:29 2018 +0200

--
 CHANGES.txt   |  1 +
 .../cassandra/db/compaction/CompactionManager.java| 14 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2725d503/CHANGES.txt
--
diff --cc CHANGES.txt
index 06fc935,12c16b7..4f2a649
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
   * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
   * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
   * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-08-24 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d8b7630fefd1ca0df9f55ab1743fbc23efd042cc
Parents: 8922ecd d049c6b
Author: Benedict Elliott Smith 
Authored: Fri Aug 24 17:29:27 2018 +0100
Committer: Benedict Elliott Smith 
Committed: Fri Aug 24 17:29:27 2018 +0100

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



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-08-24 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 8922ecdf9f95bfa5491aa74b0b52ceda2e90eba2
Parents: 68f8966 66db8d4
Author: Benedict Elliott Smith 
Authored: Fri Aug 24 16:09:21 2018 +0100
Committer: Benedict Elliott Smith 
Committed: Fri Aug 24 16:09:21 2018 +0100

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8922ecdf/CHANGES.txt
--
diff --cc CHANGES.txt
index 6464667,7049180..7c915d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
   * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
   * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-08-24 Thread benedict

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 68f8966d5bc1a11a50091290b534c0e33903dd4d
Parents: 991e197 5c4ce60
Author: Benedict Elliott Smith 
Authored: Fri Aug 24 15:47:48 2018 +0100
Committer: Benedict Elliott Smith 
Committed: Fri Aug 24 15:47:48 2018 +0100

--
 .../cassandra/utils/SortedBiMultiValMap.java| 29 
 1 file changed, 17 insertions(+), 12 deletions(-)
--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-08-16 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 65a46820bb6d28bc6e359807699e8c6ae562e0c4
Parents: 4f4c390 236c47e
Author: Aleksey Yeshchenko 
Authored: Thu Aug 16 15:44:12 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Thu Aug 16 15:44:12 2018 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt| 10 +++
 doc/cql3/CQL.textile|  2 +-
 src/java/org/apache/cassandra/db/Columns.java   | 22 +--
 .../org/apache/cassandra/db/ColumnsTest.java| 69 +++-
 5 files changed, 95 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/CHANGES.txt
--
diff --cc CHANGES.txt
index e2d1681,eccece2..6464667
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
   * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
   Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/NEWS.txt
--
diff --cc NEWS.txt
index 578e426,29864bc..ea53c36
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -42,7 -42,17 +42,17 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -3.0.18
++3.11.4
+ ==
+ 
+ Upgrading
+ -
+ - The order of static columns in SELECT * has been fixed to match that of 
2.0 and 2.1 - they are now sorted
+   alphabetically again, by their name, just like regular columns are. If 
you use prepared statements and
+   SELECT * queries, and have both simple and collection static columns in 
those tables, and are upgrading from an
+   earlier 3.0 version, then you might be affected by this change. Please 
see CASSANDRA-14638 for details.
+ 
 -3.0.17
 +3.11.3
  =
  
  Upgrading

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index f32e30c,5f35d57..61b9d63
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1115,9 -1079,9 +1115,9 @@@ The @SELECT@ statements reads one or mo
  
  h4(#selectSelection). @@
  
- The @@ determines which columns needs to be queried and 
returned in the result-set. It consists of either the comma-separated list of 
 or the wildcard character (@*@) to select all the columns defined 
for the table.
+ The @@ determines which columns needs to be queried and 
returned in the result-set. It consists of either the comma-separated list of 
 or the wildcard character (@*@) to select all the columns defined 
for the table. Please note that for wildcard @SELECT@ queries the order of 
columns returned is not specified and is not guaranteed to be stable between 
Cassandra versions.
  
 -A @@ is either a column name to retrieve or a @@ of one 
or more @@s. The function allowed are the same as for @@ and are 
described in the "function section":#functions. In addition to these generic 
functions, the @WRITETIME@ (resp. @TTL@) function allows to select the 
timestamp of when the column was inserted (resp. the time to live (in seconds) 
for the column (or null if the column has no expiration set)).
 +A @@ is either a column name to retrieve or a @@ of one 
or more @@s. The function allowed are the same as for @@ and are 
described in the "function section":#functions. In addition to these generic 
functions, the @WRITETIME@ (resp. @TTL@) function allows to select the 
timestamp of when the column was inserted (resp. the time to live (in seconds) 
for the column (or null if the column has no expiration set)) and the 
"@CAST@":#castFun function can be used to convert one data type to another.
  
  Any @@ can be aliased using @AS@ keyword (see examples). Please 
note that @@ and @@ clause should refer to the columns 
by their original names and not by their aliases.
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/src/java/org/apache/cassandra/db/Columns.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/test/unit/org/apache/cassandra/db/ColumnsTest.java

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

2018-08-06 Thread aweisberg

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4f4c390bc105c5e407bfe8b04c282ac28862e451
Parents: f8acbd2 3d48cbc
Author: Ariel Weisberg 
Authored: Mon Aug 6 12:06:46 2018 -0400
Committer: Ariel Weisberg 
Committed: Mon Aug 6 12:06:46 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f4c390b/CHANGES.txt
--
diff --cc CHANGES.txt
index ab64ab9,7e4d88c..e2d1681
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
   Merged from 2.2:
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f4c390b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-07-05 Thread jzhuang

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 847b84323962b57699ccbbad21207c85ab392681
Parents: 942fe3f 8ead7af
Author: Jay Zhuang 
Authored: Thu Jul 5 09:42:05 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:58:31 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-07-04 Thread slebresne

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 49e63c273e973c0f8ab3769caae6f82c18449f44
Parents: c3a66ab 93012e4
Author: Sylvain Lebresne 
Authored: Wed Jul 4 11:51:34 2018 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 4 11:51:34 2018 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/context/CounterContext.java|  3 +++
 .../apache/cassandra/db/CounterCellTest.java| 23 
 3 files changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49e63c27/CHANGES.txt
--
diff --cc CHANGES.txt
index 951b0c0,00944dc..32ccda3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,6 +1,24 @@@
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49e63c27/test/unit/org/apache/cassandra/db/CounterCellTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CounterCellTest.java
index 74599c3,8859fc6..5208cb2
--- a/test/unit/org/apache/cassandra/db/CounterCellTest.java
+++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java
@@@ -29,12 -29,16 +29,15 @@@ import org.junit.Test
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.config.ColumnDefinition;
+ import org.apache.cassandra.db.rows.BTreeRow;
  import org.apache.cassandra.db.rows.BufferCell;
  import org.apache.cassandra.db.rows.Cell;
 -import org.apache.cassandra.db.rows.CellPath;
  import org.apache.cassandra.db.rows.Cells;
  import org.apache.cassandra.db.context.CounterContext;
+ import org.apache.cassandra.db.rows.Row;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.schema.KeyspaceParams;
+ import org.apache.cassandra.serializers.AsciiSerializer;
  import org.apache.cassandra.utils.*;
  
  import static org.junit.Assert.*;


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-06-14 Thread samt

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 191ad7b87a4ded26be4ab0bd192ef676f059276c
Parents: f0403b4 eb91942
Author: Sam Tunnicliffe 
Authored: Thu Jun 14 18:16:23 2018 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Jun 14 18:18:47 2018 +0100

--
 CHANGES.txt| 1 +
 .../cassandra/db/columniterator/AbstractSSTableIterator.java   | 2 +-
 .../cassandra/db/columniterator/SSTableReversedIterator.java   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/CHANGES.txt
--
diff --cc CHANGES.txt
index 083f480,ebf8764..e807340
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -3.0.17
 +3.11.3
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
   * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
--
diff --cc 
src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
index c15416f,386b2c8..4eaf8f6
--- 
a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
+++ 
b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
@@@ -483,15 -417,15 +483,15 @@@ public abstract class AbstractSSTableIt
  // Sets the reader to the beginning of blockIdx.
  public void setToBlock(int blockIdx) throws IOException
  {
 -if (blockIdx >= 0 && blockIdx < indexes.size())
 +if (blockIdx >= 0 && blockIdx < indexEntry.columnsIndexCount())
  {
  reader.seekToPosition(columnOffset(blockIdx));
+ mark = reader.file.mark();
  reader.deserializer.clearState();
  }
  
  currentIndexIdx = blockIdx;
 -reader.openMarker = blockIdx > 0 ? indexes.get(blockIdx - 
1).endOpenMarker : null;
 +reader.openMarker = blockIdx > 0 ? index(blockIdx - 
1).endOpenMarker : null;
- mark = reader.file.mark();
  
  // If we're reading an old format file and we move to the first 
block in the index (i.e. the
  // head of the partition), we skip the static row as it's already 
been read when we first opened

http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-06-06 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 02e9ddfad9babf98d743fedd005e3ca41df8c2eb
Parents: 77a1205 b8fb29a
Author: Paulo Motta 
Authored: Wed Jun 6 15:37:24 2018 -0300
Committer: Paulo Motta 
Committed: Wed Jun 6 15:37:59 2018 -0300

--
 .../org/apache/cassandra/db/SystemKeyspace.java |   2 -
 .../db/compaction/AntiCompactionTest.java   |  13 +-
 .../db/compaction/CompactionsTest.java  | 328 ---
 3 files changed, 141 insertions(+), 202 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9ddfa/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index ac51662,5f5041c..973538f
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -42,11 -40,8 +42,9 @@@ import org.slf4j.LoggerFactory
  
  import com.google.common.util.concurrent.Futures;
  
- import org.apache.cassandra.concurrent.Stage;
- import org.apache.cassandra.concurrent.StageManager;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.SchemaConstants;
  import org.apache.cassandra.cql3.QueryProcessor;
  import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.cql3.functions.*;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9ddfa/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-06-05 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 77a12053b69ceebd529556d5159f9325703283eb
Parents: b92d90d 214a3ab
Author: Jason Brown 
Authored: Tue Jun 5 13:48:56 2018 -0700
Committer: Jason Brown 
Committed: Tue Jun 5 13:50:36 2018 -0700

--
 CHANGES.txt |  1 +
 .../db/commitlog/AbstractCommitLogService.java  | 88 +---
 .../commitlog/AbstractCommitLogServiceTest.java | 49 ++-
 3 files changed, 105 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77a12053/CHANGES.txt
--
diff --cc CHANGES.txt
index 2d4ef25,dfdfbfd..2e77d2e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -3.0.17
 +3.11.3
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
   * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77a12053/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 7c5d300,0845bd5..b7ab705
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -17,15 -17,6 +17,16 @@@
   */
  package org.apache.cassandra.db.commitlog;
  
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicLong;
 +import java.util.concurrent.locks.LockSupport;
 +
++import com.google.common.annotations.VisibleForTesting;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.codahale.metrics.Timer.Context;
 +
  import org.apache.cassandra.concurrent.NamedThreadFactory;
  import org.apache.cassandra.config.Config;
  import org.apache.cassandra.db.commitlog.CommitLogSegment.Allocation;
@@@ -162,14 -160,15 +163,15 @@@ public abstract class AbstractCommitLog
  
  boolean sync()
  {
 +// always run once after shutdown signalled
 +boolean shutdownRequested = shutdown;
 +
  try
  {
 -// always run once after shutdown signalled
 -boolean run = !shutdown;
 -
  // sync and signal
 -long pollStarted = clock.currentTimeMillis();
 -boolean flushToDisk = lastSyncedAt + syncIntervalMillis <= 
pollStarted || shutdown || syncRequested;
 +long pollStarted = clock.nanoTime();
- if (lastSyncedAt + syncIntervalNanos <= pollStarted || 
shutdownRequested || syncRequested)
++boolean flushToDisk = lastSyncedAt + syncIntervalNanos <= 
pollStarted || shutdownRequested || syncRequested;
+ if (flushToDisk)
  {
  // in this branch, we want to flush the commit log to disk
  syncRequested = false;
@@@ -181,47 -180,30 +183,19 @@@
  else
  {

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

2018-05-30 Thread jzhuang

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b92d90dc14ef978fbfa9e09520a641f6669cf631
Parents: b8cbdde 38096da
Author: Jay Zhuang 
Authored: Wed May 30 21:59:22 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 22:00:51 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 84 +---
 2 files changed, 44 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/CHANGES.txt
--
diff --cc CHANGES.txt
index 3879a55,16fe6d1..2d4ef25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -3.0.17
 +3.11.3
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/build.xml
--
diff --cc build.xml
index f8cdf82,3fc64fb..4edfbb1
--- a/build.xml
+++ b/build.xml
@@@ -67,11 -66,9 +67,11 @@@
  
  
  
 +
-   
++
  
  
-   
+ 
  

  
@@@ -216,15 -212,12 +216,15 @@@
  -->
  
  
 +
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens">
 +
 +
 +
 +
  
-  
+ 
  
 -  Building Grammar 
${build.src.java}/org/apache/cassandra/cql3/Cql.g  ...
 +  Building Grammar ${build.src.antlr}/Cql.g  ...



-   
+ 

  
 +



@@@ -639,9 -584,8 +640,10 @@@
  
  
  
+ 
 -
 +
 +
 +


  
-   

  
@@@ -1396,8 -1344,8 +1398,8 @@@

  

- 
+ 
 -  
 +  
  
  

@@@ -1533,10 -1468,10 +1535,10 @@@
  

  
-   
-   
+ 


  


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-05-17 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 0d4aacc832b1ffa428970d5c0e235d54585e22c2
Parents: ab8348c 06b3521
Author: Jason Brown 
Authored: Thu May 17 10:34:56 2018 -0700
Committer: Jason Brown 
Committed: Thu May 17 10:35:36 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/net/MessagingService.java  | 14 -
 .../org/apache/cassandra/net/PingMessage.java   | 60 
 3 files changed, 72 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4aacc8/CHANGES.txt
--
diff --cc CHANGES.txt
index d70b381,1293bd4..87e7c24
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -3.0.17
 +3.11.3
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4aacc8/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 027e218,047f51f..59ed8f3
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -206,36 -143,18 +206,41 @@@ public final class MessagingService imp
  _TRACE, // dummy verb so we can use MS.droppedMessagesMap
  ECHO,
  REPAIR_MESSAGE,
 -PAXOS_PREPARE,
 -PAXOS_PROPOSE,
 -PAXOS_COMMIT,
 -@Deprecated PAGED_RANGE,
 +PAXOS_PREPARE
 +{
 +public long getTimeout()
 +{
 +return DatabaseDescriptor.getWriteRpcTimeout();
 +}
 +},
 +PAXOS_PROPOSE
 +{
 +public long getTimeout()
 +{
 +return DatabaseDescriptor.getWriteRpcTimeout();
 +}
 +},
 +PAXOS_COMMIT
 +{
 +public long getTimeout()
 +{
 +return DatabaseDescriptor.getWriteRpcTimeout();
 +}
 +},
 +@Deprecated PAGED_RANGE
 +{
 +public long getTimeout()
 +{
 +return DatabaseDescriptor.getRangeRpcTimeout();
 +}
 +},
- // remember to add new verbs at the end, since we serialize by ordinal
- UNUSED_1,
+ PING,
 -
+ // UNUSED verbs were used as padding for backward/forward 
compatability before 4.0,
+ // but it wasn't quite as bullet/future proof as needed. We still 
need to keep these entries
+ // around, at least for a major rev or two (post-4.0). see 
CASSANDRA-13993 for a discussion.
+ // For now, though, the UNUSED are legacy values (placeholders, 
basically) that should only be used
+ // for correctly adding VERBs that need to be emergency additions to 
3.0/3.11.
+ // We can reclaim them (their id's, to be correct) in future 
versions, if desired, though.

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

2018-05-14 Thread mck

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 704f9b093a219c71bc5be0682db88c447b6c433f
Parents: 2805860 6efa99c
Author: Mick Semb Wever 
Authored: Mon May 14 19:06:40 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:08:00 2018 +1000

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/repair/RepairRunnable.java  | 2 +-
 .../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java| 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/CHANGES.txt
--
diff --cc CHANGES.txt
index e63e5f3,3da808a..0e4346b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -3.0.17
 +3.11.3
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)
   * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/repair/RepairRunnable.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-05-12 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 443088fd13ce8ad71fa96389095bfb117f65c6bd
Parents: 14bfc94 b9b2a4e
Author: Jason Brown 
Authored: Sat May 12 05:29:20 2018 -0700
Committer: Jason Brown 
Committed: Sat May 12 05:31:34 2018 -0700

--
 CHANGES.txt| 1 +
 conf/cassandra-env.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/443088fd/CHANGES.txt
--
diff --cc CHANGES.txt
index fc643ad,7c557f7..3e8f687
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -3.0.17
 +3.11.3
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)
   * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/443088fd/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 49d03ce,74511f0..c78a3fc
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -390,9 -390,36 +390,9 @@@ Function SetCassandraEnvironmen
  if ($env:CASSANDRA_HEAPDUMP_DIR)
  {
  $unixTimestamp = [int64](([datetime]::UtcNow)-(get-date 
"1/1/1970")).TotalSeconds
- $env:JVM_OPTS="$env:JVM_OPTS 
-XX:HeapDumpPath=$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof"
+ $env:JVM_OPTS="$env:JVM_OPTS 
-XX:HeapDumpPath=""$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof"""
  }
  
 -if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or 
[convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40)
 -{
 -echo "Cassandra 3.0 and later require Java 8u40 or later."
 -exit
 -}
 -
 -# enable assertions.  disabling this in production will give a modest
 -# performance benefit (around 5%).
 -$env:JVM_OPTS = "$env:JVM_OPTS -ea"
 -
 -# Specifies the default port over which Cassandra will be available for
 -# JMX connections.
 -$JMX_PORT="7199"
 -
 -# store in env to check if it's avail in verification
 -$env:JMX_PORT=$JMX_PORT
 -
 -# enable thread priorities, primarily so we can give periodic tasks
 -# a lower priority to avoid interfering with client workload
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities"
 -# allows lowering thread priority without being root on linux - probably
 -# not necessary on Windows but doesn't harm anything.
 -# see http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workar
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:ThreadPriorityPolicy=42"
 -
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError"
 -
  # stop the jvm on OutOfMemoryError as it can result in some data 
corruption
  # uncomment the preferred option
  # ExitOnOutOfMemoryError and CrashOnOutOfMemoryError require a JRE 
greater or equals to 1.7 update 101 or 1.8 update 92


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-05-03 Thread mck

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: bc30a6f733545205271a2cdf82cfa7ab42eee6f4
Parents: dd9ae1d 9d498dc
Author: Mick Semb Wever 
Authored: Fri May 4 14:47:10 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 4 15:01:54 2018 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cache/AutoSavingCache.java |  3 +-
 .../cassandra/db/compaction/CompactionInfo.java | 33 +---
 .../apache/cassandra/db/view/ViewBuilder.java   | 19 ++-
 .../io/sstable/IndexSummaryRedistribution.java  |  5 +--
 .../tools/nodetool/CompactionStats.java |  7 +++--
 6 files changed, 48 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/CHANGES.txt
--
diff --cc CHANGES.txt
index 2d7053d,f1dcf52..5f66b62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix progress stats and units in compactionstats (CASSANDRA-12244)
   * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
   * Deprecate background repair and probablistic read_repair_chance table 
options

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index aa13ca3,00431b9..a40a8a9
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -42,9 -41,11 +42,10 @@@ import org.apache.cassandra.db.ColumnFa
  import org.apache.cassandra.db.compaction.CompactionInfo;
  import org.apache.cassandra.db.compaction.CompactionManager;
  import org.apache.cassandra.db.compaction.OperationType;
+ import org.apache.cassandra.db.compaction.CompactionInfo.Unit;
  import org.apache.cassandra.io.FSWriteError;
  import org.apache.cassandra.io.util.*;
 -import 
org.apache.cassandra.io.util.ChecksummedRandomAccessReader.CorruptFileException;
 +import org.apache.cassandra.io.util.CorruptFileException;
  import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
  import org.apache.cassandra.service.CacheService;
  import org.apache.cassandra.utils.JVMStabilityInspector;

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/db/view/ViewBuilder.java
--
diff --cc src/java/org/apache/cassandra/db/view/ViewBuilder.java
index 8e647ea,68cb265..d9c9e71
--- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java
+++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java
@@@ -190,25 -188,9 +193,25 @@@ public class ViewBuilder extends Compac
  }
  }
  
 +private void updateDistributed(String ksname, String viewName, UUID 
localHostId)
 +{
 +try
 +{
 +SystemDistributedKeyspace.successfulViewBuild(ksname, viewName, 
localHostId);
 +SystemKeyspace.setViewBuiltReplicated(ksname, viewName);
 +}
 +catch (Exception e)
 +{
 +ScheduledExecutors.nonPeriodicTasks.schedule(() -> 
CompactionManager.instance.submitViewBuilder(this),
 + 5,
 +

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

2018-05-03 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: dd9ae1d3ef52c07200e6498b075e85c7fc36a468
Parents: 73f5b8f 15c463c
Author: Marcus Eriksson 
Authored: Thu May 3 15:42:01 2018 +0200
Committer: Marcus Eriksson 
Committed: Thu May 3 15:42:01 2018 +0200

--
 .circleci/config.yml | 8 
 1 file changed, 8 insertions(+)
--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-05-02 Thread jzhuang

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2d19de1cfabdc848477b33ba922c63013a7a9a1a
Parents: 783bbb3 eb68c31
Author: Jay Zhuang 
Authored: Wed May 2 11:02:03 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 11:03:34 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 35 +---
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 443c298,39edeb1..837b891
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
   * Deprecate background repair and probablistic read_repair_chance table 
options
 (CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 164e32d,81cc2e1..027b7cf
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -999,18 -961,24 +999,24 @@@ public final class SchemaKeyspac
  }
  catch (MissingColumns exc)
  {
- if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+ "corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+ "to be dropped, {}run the 
following query to cleanup: " +
+ "\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+ "DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+ "If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
 -keyspaceName, tableName, 
NAME, COLUMNS,
 -NAME, TABLES, keyspaceName, 
tableName,
 -NAME, COLUMNS, keyspaceName, 
tableName,
 -NAME, COLUMNS);
++keyspaceName, tableName, 
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, TABLES, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ 
+ if (IGNORE_CORRUPTED_SCHEMA_TABLES)
  {
- logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
-  "corruption or concurrent dropping and 
altering of a table.  If this table " +
-  "is supposed to be dropped, restart 
cassandra with

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

2018-04-30 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b67d6fb6003640ee93b2a5232249ee362097aca8
Parents: 32f9e67 e16f0ed
Author: Aleksey Yeshchenko 
Authored: Mon Apr 30 19:10:23 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Mon Apr 30 19:10:23 2018 +0100

--
 .../org/apache/cassandra/io/sstable/SSTableReaderTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b67d6fb6/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-04-30 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 32f9e6763b7a857a015da0b20af1d3ff486da0c9
Parents: 684120d b2f6ce9
Author: Aleksey Yeshchenko 
Authored: Mon Apr 30 18:48:08 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Mon Apr 30 18:48:08 2018 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/hints/HintsCatalog.java|   7 ++
 .../apache/cassandra/hints/HintsService.java|   2 +-
 .../org/apache/cassandra/hints/HintsStore.java  |   7 ++
 .../cassandra/service/StorageService.java   |   7 +-
 .../cassandra/hints/HintsCatalogTest.java   | 120 ++-
 6 files changed, 138 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f9e676/CHANGES.txt
--
diff --cc CHANGES.txt
index 5450322,857cf96..c392059
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
   * Deprecate background repair and probablistic read_repair_chance table 
options
 (CASSANDRA-13910)
   * Add missed CQL keywords to documentation (CASSANDRA-14359)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f9e676/src/java/org/apache/cassandra/hints/HintsService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f9e676/src/java/org/apache/cassandra/hints/HintsStore.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f9e676/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
--
diff --cc test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
index a255338,928fd31..68acd0c
--- a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
@@@ -43,7 -69,21 +69,7 @@@ public class HintsCatalogTes
  }
  }
  
- public static void loadCompletenessAndOrderTest(File directory) throws 
IOException
 -@Test
 -public void exciseHintFiles() throws IOException
 -{
 -File directory = Files.createTempDirectory(null).toFile();
 -try
 -{
 -exciseHintFiles(directory);
 -}
 -finally
 -{
 -directory.deleteOnExit();
 -}
 -}
 -
+ private void loadCompletenessAndOrderTest(File directory) throws 
IOException
  {
  UUID hostId1 = UUID.randomUUID();
  UUID hostId2 = UUID.randomUUID();
@@@ -79,37 -119,39 +105,84 @@@
  assertNull(store2.poll());
  }
  
 +@Test
 +public void deleteHintsTest() throws IOException
 +{
 +File directory = Files.createTempDirectory(null).toFile();
 +UUID hostId1 = UUID.randomUUID();
 +UUID hostId2 = UUID.randomUUID();
 +long now = System.currentTimeMillis();
 +writeDescriptor(directory, new HintsDescriptor(hostId1, now));
- writeDescriptor(directory, new HintsDescriptor(hostId1, now+1));
- writeDescriptor(directory, new HintsDescriptor(hostId2, now+2));
- writeDescriptor(directory, new HintsDescriptor(hostId2, now+3));
++writeDescriptor(directory, new HintsDescriptor(hostId1, now + 1));
++writeDescriptor(directory, new HintsDescriptor(hostId2,

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

2018-04-17 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: e9462b9af7c85bc5e1de6bc1662768da71c1061b
Parents: 28ccf3f 00e5a3d
Author: Blake Eggleston 
Authored: Tue Apr 17 14:15:12 2018 -0700
Committer: Blake Eggleston 
Committed: Tue Apr 17 14:15:12 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9462b9a/CHANGES.txt
--
diff --cc CHANGES.txt
index 39213a1,1aa291f..7253ec6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
   * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
   * Handle all exceptions when opening sstables (CASSANDRA-14202)
   * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-04-11 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 75a932087d027a569f37b1e3c1047aaff107549e
Parents: 19e329e 22bb413
Author: Marcus Eriksson 
Authored: Wed Apr 11 14:47:47 2018 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 11 14:47:47 2018 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a93208/CHANGES.txt
--
diff --cc CHANGES.txt
index e0145d4,9012f8c..e55ae28
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -3.0.17
 +3.11.3
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
   * Handle all exceptions when opening sstables (CASSANDRA-14202)
   * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
   * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)

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

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-04-10 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 19e329eb5c124d2e37b52052e8622f0515f058b7
Parents: c1020d6 edcb90f
Author: Marcus Eriksson 
Authored: Tue Apr 10 15:26:30 2018 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 10 15:26:30 2018 +0200

--
 CHANGES.txt  |  1 +
 .../cassandra/io/sstable/CorruptSSTableException.java|  4 ++--
 .../cassandra/io/sstable/format/SSTableReader.java   | 11 +++
 3 files changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19e329eb/CHANGES.txt
--
diff --cc CHANGES.txt
index c4f05d5,94b2276..e0145d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -3.0.17
 +3.11.3
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Handle all exceptions when opening sstables (CASSANDRA-14202)
   * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
   * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
   * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19e329eb/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-29 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 18278e42249bbb298c9a8a805b7f1604925fb138
Parents: 5cbe08b 68079e4
Author: Aleksey Yeshchenko 
Authored: Thu Mar 29 14:00:06 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Thu Mar 29 14:00:06 2018 +0100

--
 CHANGES.txt |  1 +
 .../hints/ChecksumMismatchException.java| 28 
 .../apache/cassandra/hints/HintsCatalog.java|  4 ++-
 .../apache/cassandra/hints/HintsDescriptor.java | 20 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/18278e42/CHANGES.txt
--
diff --cc CHANGES.txt
index 1f4ffb8,7917712..62f4345
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -3.0.17
 +3.11.3
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
   * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
   * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
   * Respect max hint window when hinting for LWT (CASSANDRA-14215)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/18278e42/src/java/org/apache/cassandra/hints/HintsDescriptor.java
--
diff --cc src/java/org/apache/cassandra/hints/HintsDescriptor.java
index f99f9d8,e9e1c30..00224e2
--- a/src/java/org/apache/cassandra/hints/HintsDescriptor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDescriptor.java
@@@ -22,8 -22,8 +22,9 @@@ import java.io.IOException
  import java.io.RandomAccessFile;
  import java.nio.charset.StandardCharsets;
  import java.nio.file.Path;
 +import java.util.HashMap;
  import java.util.Map;
+ import java.util.Optional;
  import java.util.UUID;
  import java.util.regex.Pattern;
  import java.util.zip.CRC32;


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-15 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f57d12ee7af1bf3b93d36b486749defd2204d066
Parents: 19a5478 1d05bda
Author: Blake Eggleston 
Authored: Thu Mar 15 10:55:46 2018 -0700
Committer: Blake Eggleston 
Committed: Thu Mar 15 10:55:46 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f57d12ee/src/java/org/apache/cassandra/io/sstable/SSTable.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-15 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 19a547861ad6c68e4ce584ee1b9ffee66bd5042d
Parents: 4c6a10a fdc61cb
Author: Aleksey Yeshchenko 
Authored: Thu Mar 15 17:17:23 2018 +0300
Committer: Aleksey Yeshchenko 
Committed: Thu Mar 15 17:17:23 2018 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/CHANGES.txt
--
diff --cc CHANGES.txt
index fcd86ed,6099b01..bae967f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,11 @@@
 -3.0.17
 +3.11.3
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
-  * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+  * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+  * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
   * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
   * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
   * Log when SSTables are deleted (CASSANDRA-14302)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 4dc05e3,bf58ef2..52dd8ab
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -522,7 -497,7 +522,7 @@@ public class StorageProxy implements St
  return false;
  }
  
- private static void commitPaxos(Commit proposal, ConsistencyLevel 
consistencyLevel, boolean shouldHint, long queryStartNanoTime) throws 
WriteTimeoutException
 -private static void commitPaxos(Commit proposal, ConsistencyLevel 
consistencyLevel, boolean allowHints) throws WriteTimeoutException
++private static void commitPaxos(Commit proposal, ConsistencyLevel 
consistencyLevel, boolean allowHints, long queryStartNanoTime) throws 
WriteTimeoutException
  {
  boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
  Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-14 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 5a662ea3ffdbb9563cf3ef959deb13982b084b24
Parents: 3fa7c08 3d7471a
Author: Jason Brown 
Authored: Wed Mar 14 09:57:42 2018 -0700
Committer: Jason Brown 
Committed: Wed Mar 14 09:59:42 2018 -0700

--
 CHANGES.txt |  1 +
 doc/native_protocol_v3.spec |  1 +
 doc/native_protocol_v4.spec | 12 
 doc/native_protocol_v5.spec | 12 
 4 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a662ea3/CHANGES.txt
--
diff --cc CHANGES.txt
index c2b907e,62b904f..8f913cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.17
 +3.11.3
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
   * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
   * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
   * Log when SSTables are deleted (CASSANDRA-14302)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a662ea3/doc/native_protocol_v3.spec
--
diff --cc doc/native_protocol_v3.spec
index c38e26c,0d7f94d..9b1084b
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@@ -979,6 -979,8 +979,7 @@@ Table of Content
   - "BATCH_LOG": the timeout occured during the
 write to the batch log when a (logged) batch
 write was requested.
 - - "CAS": the timeout occured during the Compare 
And Set
 -   write/update.
++ - "CAS": the timeout occured during the Compare 
And Set write/update.
  0x1200Read_timeout: Timeout exception during a read request. The rest
of the ERROR message body will be
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a662ea3/doc/native_protocol_v4.spec
--
diff --cc doc/native_protocol_v4.spec
index 2188a33,02802a7..5e1e01d
--- a/doc/native_protocol_v4.spec
+++ b/doc/native_protocol_v4.spec
@@@ -1068,6 -1068,6 +1068,12 @@@ Table of Content
   - "BATCH_LOG": the timeout occurred during the
 write to the batch log when a (logged) batch
 write was requested.
++ - "CAS": the timeout occured during the Compare 
And Set write/update.
++ - "VIEW": the timeout occured when a write 
involves
++VIEW update and failure to acqiure local 
view(MV)
++lock for key within timeout
++ - "CDC": the timeout occured when 
cdc_total_space_in_mb is
++exceeded when doing a write to data tracked 
by cdc.
  0x1200Read_timeout: Timeout exception during a read request. The rest
of the ERROR message body will be
  
@@@ -1135,6 -1135,8 +1141,12 @@@
   - "BATCH_LOG": the failure occured during the
 write to the batch log when a (logged) batch
 write was requested.
 - - "CAS": the timeout occured during the Compare 
And Set
 -   write/update.
++ - "CAS": the failure occured during the Compare 
And Set write/update.
++ - "VIEW": the failure occured when a write 
involves
++VIEW update and failure to acqiure local 
view(MV)
++lock for key within timeout
++ - "CDC": the failure occured when 
cdc_total_space_in_mb is
++exceeded when doing a write to data tracked 
by cdc.
  
  0x2000Syntax_error: The submitted query has a syntax error.
  0x2100Unauthorized: The logged user doesn't have the right to perform

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

2018-03-08 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 620f37c54e63db1f651c5dc58cdf1c6824f88069
Parents: c87dc1a 2c15098
Author: Blake Eggleston 
Authored: Thu Mar 8 15:38:02 2018 -0800
Committer: Blake Eggleston 
Committed: Thu Mar 8 15:39:11 2018 -0800

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/cql3/ColumnCondition.java|  4 
 .../operations/InsertUpdateIfConditionTest.java   | 18 ++
 3 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/CHANGES.txt
--
diff --cc CHANGES.txt
index 5b8ee0c,9c6a853..0e9ef6d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
   * Log when SSTables are deleted (CASSANDRA-14302)
   * Fix batch commitlog sync regression (CASSANDRA-14292)
   * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-08 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c87dc1ae7fc0df0649e06a4c611d1cc5488dbb25
Parents: 61edf6f d774005
Author: Blake Eggleston 
Authored: Thu Mar 8 14:28:58 2018 -0800
Committer: Blake Eggleston 
Committed: Thu Mar 8 14:28:58 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c87dc1ae/CHANGES.txt
--
diff --cc CHANGES.txt
index bb652f3,b49a349..5b8ee0c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Log when SSTables are deleted (CASSANDRA-14302)
   * Fix batch commitlog sync regression (CASSANDRA-14292)
   * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
   * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c87dc1ae/src/java/org/apache/cassandra/io/sstable/SSTable.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-07 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 61edf6f2f027b4bf5596489ce2452e5993e6a683
Parents: a060698 00c90c1
Author: Jason Brown 
Authored: Wed Mar 7 04:01:20 2018 -0800
Committer: Jason Brown 
Committed: Wed Mar 7 04:06:15 2018 -0800

--
 CHANGES.txt |  1 +
 .../db/commitlog/BatchCommitLogTest.java| 85 
 2 files changed, 86 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61edf6f2/CHANGES.txt
--
diff --cc CHANGES.txt
index ff726a9,6596602..bb652f3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fix batch commitlog sync regression (CASSANDRA-14292)
   * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
   * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
   * Fully utilise specified compaction threads (CASSANDRA-14210)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61edf6f2/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java
index 000,c7f7e57..1f8dbdf
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/BatchCommitLogTest.java
@@@ -1,0 -1,66 +1,85 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements.  See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership.  The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License.  You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
+ package org.apache.cassandra.db.commitlog;
+ 
+ import static org.junit.Assert.*;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.concurrent.TimeUnit;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.config.Config;
+ import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.Mutation;
+ import org.apache.cassandra.db.RowUpdateBuilder;
+ import org.apache.cassandra.db.compaction.CompactionManager;
+ import org.apache.cassandra.db.marshal.AsciiType;
+ import org.apache.cassandra.db.marshal.BytesType;
+ import org.apache.cassandra.schema.KeyspaceParams;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ 
+ public class BatchCommitLogTest
+ {
+ private static final long CL_BATCH_SYNC_WINDOW = 1000; // 1 second
+ private static final String KEYSPACE1 = "CommitLogTest";
+ private static final String STANDARD1 = "Standard1";
+ 
+ @BeforeClass
+ public static void before()
+ {
++DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogSync(Config.CommitLogSync.batch);
+ DatabaseDescriptor.setCommitLogSyncBatchWindow(CL_BATCH_SYNC_WINDOW);
+ 
+ KeyspaceParams.DEFAULT_LOCAL_DURABLE_WRITES = false;
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ KeyspaceParams.simple(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, 
STANDARD1, 0, AsciiType.instance, BytesType.instance));
+ CompactionManager.instance.disableAutoCompaction();
+ }
+ 
+ @Test
+ public void testBatchCLSyncImmediately()
+ {
+ ColumnFamilyStore cfs1 = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(STANDARD1);
+ Mutation m = new RowUpdateBuilder(cfs1.metadata, 0, "key")
 -

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

2018-03-06 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a060698c55797d8f92db290ea2fe209433dc7b3f
Parents: 7f02348 c673389
Author: Paulo Motta 
Authored: Tue Mar 6 11:14:49 2018 -0300
Committer: Paulo Motta 
Committed: Tue Mar 6 11:15:15 2018 -0300

--
 CHANGES.txt | 1 +
 NEWS.txt| 8 
 src/java/org/apache/cassandra/service/StorageProxy.java | 7 +--
 3 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/CHANGES.txt
--
diff --cc CHANGES.txt
index a4be758,ad558de..ff726a9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
   * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/NEWS.txt
--
diff --cc NEWS.txt
index 445623e,64de28a..745dad2
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -42,8 -42,17 +42,16 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -3.0.17
++3.11.3
+ =
+ 
+ Upgrading
+ -
 -- Materialized view users upgrading from 3.0.15 or later that have 
performed range movements (join, decommission, move, etc),
 -  should run repair on the base tables, and subsequently on the views to 
ensure data affected by CASSANDRA-14251 is correctly
 -  propagated to all replicas.
++- Materialized view users upgrading from 3.0.15 (3.0.X series) or 3.11.1 
(3.11.X series) and  later that have performed range movements (join, 
decommission, move, etc),
++  should run repair on the base tables, and subsequently on the views to 
ensure data affected by CASSANDRA-14251 is correctly propagated to all replicas.
+ 
 -3.0.16
 -=
 +3.11.2
 +==
  
  Upgrading
  -

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index e67d46e,7a6bed4..4dc05e3
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -795,9 -759,11 +795,12 @@@ public class StorageProxy implements St
  continue;
  }
  
- // When local node is the paired endpoint just apply the 
mutation locally.
- if 
(pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) && 
StorageService.instance.isJoined())
+ // When local node is the endpoint we can just apply the 
mutation locally,
+ // unless there are pending endpoints, in which case we 
want to do an ordinary
+ // write so the view mutation is sent to the pending 
endpoint
+ if 
(pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) && 
StorageService.instance.isJoined()
+ && pendingEndpoints.isEmpty())
 +{
  try
  {
  mutation.apply(writeCommitLog);


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-03-05 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7f02348ecf5f611c8f8cc793425ca8cf3f9099c9
Parents: d6982cd 85fafd0
Author: Jason Brown 
Authored: Mon Mar 5 14:34:21 2018 -0800
Committer: Jason Brown 
Committed: Mon Mar 5 14:35:32 2018 -0800

--
 CHANGES.txt | 1 +
 .../cassandra/db/commitlog/AbstractCommitLogService.java| 4 ++--
 .../org/apache/cassandra/db/commitlog/CommitLogSegment.java | 9 +
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f02348e/CHANGES.txt
--
diff --cc CHANGES.txt
index 163d787,9734507..a4be758
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,19 +1,45 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 -Merged from 2.1:
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  Merged from 2.2:
   * Backport circleci yaml (CASSANDRA-14240)
 +Merged from 2.1:
 + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
 -3.0.16
 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 - * Add MinGW uname check to start scripts (CASSANDRA-12940)
 - * Protect against overflow of local expiration time (CASSANDRA-14092)
 +
 +3.11.2
 + * Fix ReadCommandTest (CASSANDRA-14234)
 + * Remove trailing period from latency reports at keyspace level 
(CASSANDRA-14233)
 + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case 
as well (CASSANDRA-14212)
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 +Merged from 3.0:
 + * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f02348e/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 4571b54,f3cfd29..7c5d300
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++

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

2018-03-05 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 465d86904908b4d06cb4a3172dd5c6421ddef1b8
Parents: c494696 f88ec93
Author: Marcus Eriksson 
Authored: Mon Mar 5 09:15:15 2018 +0100
Committer: Marcus Eriksson 
Committed: Mon Mar 5 09:15:15 2018 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 11 +++---
 .../org/apache/cassandra/utils/FBUtilities.java | 36 +++
 .../apache/cassandra/utils/FBUtilitiesTest.java | 37 
 4 files changed, 80 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/CHANGES.txt
--
diff --cc CHANGES.txt
index 33d5da3,5599906..163d787
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,18 +1,44 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 -Merged from 2.1:
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  Merged from 2.2:
   * Backport circleci yaml (CASSANDRA-14240)
 +Merged from 2.1:
 + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
 -3.0.16
 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 - * Add MinGW uname check to start scripts (CASSANDRA-12940)
 - * Protect against overflow of local expiration time (CASSANDRA-14092)
 +
 +3.11.2
 + * Fix ReadCommandTest (CASSANDRA-14234)
 + * Remove trailing period from latency reports at keyspace level 
(CASSANDRA-14233)
 + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case 
as well (CASSANDRA-14212)
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 +Merged from 3.0:
 + * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/src/java/org/apache/cassandra/utils/FBUtilities.java
--

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

2018-02-19 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: abd9be1e4639c975b1fdf5d1ce26f6095236bb74
Parents: a798257 d73f45b
Author: Marcus Eriksson 
Authored: Mon Feb 19 07:53:43 2018 -0800
Committer: Marcus Eriksson 
Committed: Mon Feb 19 07:53:43 2018 -0800

--
 CHANGES.txt |  7 ++-
 .../apache/cassandra/db/lifecycle/Helpers.java  | 19 ++-
 .../apache/cassandra/db/lifecycle/LogFile.java  | 38 +++--
 .../cassandra/db/lifecycle/LogRecord.java   | 11 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  | 33 ++--
 .../apache/cassandra/db/lifecycle/Tracker.java  |  2 +-
 .../cassandra/db/lifecycle/HelpersTest.java | 56 +---
 7 files changed, 79 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/CHANGES.txt
--
diff --cc CHANGES.txt
index f8af8c4,8cf665e..33d5da3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,17 +1,43 @@@
 -3.0.17
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
- Merged from 2.2
++Merged from 3.0:
+  * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 -Merged from 2.1:
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
+ Merged from 2.2:
   * Backport circleci yaml (CASSANDRA-14240)
- Merged from 2.1
++Merged from 2.1:
 + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
 -3.0.16
 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 - * Add MinGW uname check to start scripts (CASSANDRA-12940)
 - * Protect against overflow of local expiration time (CASSANDRA-14092)
++
 +3.11.2
 + * Fix ReadCommandTest (CASSANDRA-14234)
 + * Remove trailing period from latency reports at keyspace level 
(CASSANDRA-14233)
 + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case 
as well (CASSANDRA-14212)
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 +Merged from 3.0:
 + * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
--
diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java
index 123dd8a,8425a6d..af6f435
---

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

2018-02-09 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6eb65e5a23d3af30b2ecc1f5ea25c30c3b14e284
Parents: 43aa79d 21978bf
Author: Marcus Eriksson 
Authored: Fri Feb 9 16:20:32 2018 +0100
Committer: Marcus Eriksson 
Committed: Fri Feb 9 16:22:02 2018 +0100

--
 CHANGES.txt |  2 +-
 .../cassandra/db/compaction/Verifier.java   |  2 +
 .../io/util/DataIntegrityMetadata.java  |  2 +-
 .../org/apache/cassandra/db/VerifyTest.java | 39 
 .../cassandra/io/sstable/LegacySSTableTest.java | 18 +
 5 files changed, 61 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/CHANGES.txt
--
diff --cc CHANGES.txt
index 4eb03e5,f42f3f4..c38b69b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,7 +1,28 @@@
 -3.0.16
 +3.11.2
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
- 
 +Merged from 3.0:
+  * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/src/java/org/apache/cassandra/db/compaction/Verifier.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/test/unit/org/apache/cassandra/db/VerifyTest.java
--
diff --cc test/unit/org/apache/cassandra/db/VerifyTest.java
index 6808c47,0748270..a332f74
--- a/test/unit/org/apache/cassandra/db/VerifyTest.java
+++ b/test/unit/org/apache/cassandra/db/VerifyTest.java
@@@ -23,8 -23,8 +23,9 @@@ import com.google.common.base.Charsets
  import org.apache.cassandra.OrderedJUnit4ClassRunner;
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.cache.ChunkCache;
  import org.apache.cassandra.UpdateBuilder;
+ import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
  import org.apache.cassandra.db.compaction.CompactionManager;
  import org.apache.cassandra.db.compaction.Verifier;
  import org.apache.cassandra.db.marshal.UUIDType;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
--

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

2018-02-07 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d369190964be9a6011f707a7e584446f9ec57a73
Parents: de6c62d 7885a70
Author: Marcus Eriksson 
Authored: Wed Feb 7 09:06:19 2018 +0100
Committer: Marcus Eriksson 
Committed: Wed Feb 7 09:06:19 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3691909/CHANGES.txt
--
diff --cc CHANGES.txt
index 30ca8a8,4e8f2ac..8c0d8f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,6 +1,26 @@@
 -3.0.16
 - * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 +3.11.2
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
   * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
++ * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-01-22 Thread spod

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c181943a46bda93f8543019046f783ca045c8921
Parents: e7b9c1f 0628520
Author: Stefan Podkowinski 
Authored: Mon Jan 22 13:35:26 2018 +0100
Committer: Stefan Podkowinski 
Committed: Mon Jan 22 13:36:39 2018 +0100

--
 redhat/cassandra.spec | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c181943a/redhat/cassandra.spec
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-01-19 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d0b7566ff8386c4246ec24232256e7860338b724
Parents: fc3357a 0d728c1
Author: Jason Brown 
Authored: Fri Jan 19 05:14:20 2018 -0800
Committer: Jason Brown 
Committed: Fri Jan 19 05:14:45 2018 -0800

--
 bin/cassandra | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0b7566f/bin/cassandra
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-01-15 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 36375f8b5571891e318ba4abaa61d96477e52e22
Parents: 5133526 51bf518
Author: Paulo Motta 
Authored: Sat Jan 13 01:25:10 2018 -0200
Committer: Paulo Motta 
Committed: Sat Jan 13 01:25:10 2018 -0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/CHANGES.txt
--
diff --cc CHANGES.txt
index a748e28,0453ddd..973939e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -3.0.16
 +3.11.2
+  * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 6cd1064,9fbd3a8..c211f0b
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -541,8 -544,9 +541,8 @@@ public class OutboundTcpConnection exte
  }
  catch (IOException e)
  {
- socket = null;
+ disconnect();
 -if (logger.isTraceEnabled())
 -logger.trace("unable to connect to " + 
poolReference.endPoint(), e);
 +logger.debug("Unable to connect to {}", 
poolReference.endPoint(), e);
  Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, 
TimeUnit.MILLISECONDS);
  }
  }


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2018-01-10 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4faa6e12ff22daa2c6330993825c28b433175df6
Parents: 9337ca3 fde05f4
Author: Jason Brown 
Authored: Wed Jan 10 05:09:45 2018 -0800
Committer: Jason Brown 
Committed: Wed Jan 10 05:10:54 2018 -0800

--
 CHANGES.txt | 1 +
 build.xml   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4faa6e12/CHANGES.txt
--
diff --cc CHANGES.txt
index 7ac528c,c32e56a..1b252f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -3.0.16
 +3.11.2
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)
   * Extra range tombstone bound creates double rows (CASSANDRA-14008)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-12-21 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b28fc1bff35800450c03343b85b8bc38b645f20d
Parents: adc32ac 5b4485b
Author: Marcus Eriksson 
Authored: Fri Dec 22 07:55:59 2017 +0100
Committer: Marcus Eriksson 
Committed: Fri Dec 22 07:55:59 2017 +0100

--
 src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
 1 file changed, 1 insertion(+)
--


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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-12-19 Thread ifesdjeen

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: adc32ac836e90b8c4503030feb76ce031998ad80
Parents: 95c8aef 0521f8d
Author: Alex Petrov 
Authored: Tue Dec 19 10:55:50 2017 +0100
Committer: Alex Petrov 
Committed: Tue Dec 19 10:55:50 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/index/TargetParser.java|  17 +--
 .../DropCompactStorageThriftTest.java   | 116 +++
 3 files changed, 127 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc32ac8/CHANGES.txt
--
diff --cc CHANGES.txt
index 3f15c5d,7746c73..5a1b891
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.16
 +3.11.2
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)
   * Extra range tombstone bound creates double rows (CASSANDRA-14008)
   * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc32ac8/src/java/org/apache/cassandra/index/TargetParser.java
--
diff --cc src/java/org/apache/cassandra/index/TargetParser.java
index 849ad16,000..96d03af
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/TargetParser.java
+++ b/src/java/org/apache/cassandra/index/TargetParser.java
@@@ -1,90 -1,0 +1,93 @@@
 +/*
 + * 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.index;
 +
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
 +
 +import org.apache.commons.lang3.StringUtils;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.utils.Pair;
 +
 +public class TargetParser
 +{
 +private static final Pattern TARGET_REGEX = 
Pattern.compile("^(keys|entries|values|full)\\((.+)\\)$");
 +private static final Pattern TWO_QUOTES = Pattern.compile("\"\"");
 +private static final String QUOTE = "\"";
 +
 +public static Pair parse(CFMetaData 
cfm, IndexMetadata indexDef)
 +{
 +String target = indexDef.options.get("target");
 +assert target != null : String.format("No target definition found for 
index %s", indexDef.name);
 +Pair result = parse(cfm, target);
 +if (result == null)
 +throw new ConfigurationException(String.format("Unable to parse 
targets for index %s (%s)", indexDef.name, target));
 +return

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

2017-12-13 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c000827afd48b2dc9901c530d5b4118107114c8d
Parents: e646e50 db788fe
Author: Jason Brown 
Authored: Wed Dec 13 19:51:53 2017 -0800
Committer: Jason Brown 
Committed: Wed Dec 13 19:52:31 2017 -0800

--
 CHANGES.txt |   1 +
 conf/cassandra.yaml |   8 -
 .../org/apache/cassandra/config/Config.java |   1 -
 .../cassandra/config/DatabaseDescriptor.java|  10 -
 .../db/commitlog/AbstractCommitLogService.java  | 215 +++
 .../db/commitlog/PeriodicCommitLogService.java  |   3 +-
 .../commitlog/AbstractCommitLogServiceTest.java | 166 ++
 .../commitlog/CommitLogChainedMarkersTest.java  |   1 -
 .../CommitLogSegmentBackpressureTest.java   |   8 +-
 9 files changed, 295 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c000827a/CHANGES.txt
--
diff --cc CHANGES.txt
index 60794f0,ee90a67..aa71620
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.16
 +3.11.2
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Improve commit log chain marker updating (CASSANDRA-14108)
   * Extra range tombstone bound creates double rows (CASSANDRA-14008)
   * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
   * Accept role names containing forward-slash (CASSANDRA-14088)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c000827a/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index 5fe752e,64d41bb..a01203c
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -198,9 -190,8 +198,8 @@@ public class Confi
  public String commitlog_directory;
  public Integer commitlog_total_space_in_mb;
  public CommitLogSync commitlog_sync;
 -public Double commitlog_sync_batch_window_in_ms;
 -public Integer commitlog_sync_period_in_ms;
 +public double commitlog_sync_batch_window_in_ms = Double.NaN;
 +public int commitlog_sync_period_in_ms;
- public int commitlog_marker_period_in_ms = 0;
  public int commitlog_segment_size_in_mb = 32;
  public ParameterizedClass commitlog_compression;
  public int commitlog_max_compression_buffers_in_pool = 3;

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c000827a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 0410650,829530d..4571b54
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -17,21 -17,17 +17,21 @@@
   */
  package org.apache.cassandra.db.commitlog;
  
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicLong;
 +import java.util.concurrent.locks.LockSupport;
 +
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.codahale.metrics.Timer.Context;
 +
  import org.apache.cassandra.concurrent.NamedThreadFactory;
  import org.apache.cassandra.config.Config;
- import org.apache.cassandra.config.DatabaseDescriptor;

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

2017-12-12 Thread jjirsa

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 052514542220e66e8b755aaf8b5e015c8416b5a1
Parents: a7c45be 4a2b516
Author: Jeff Jirsa 
Authored: Tue Dec 12 09:52:50 2017 -0800
Committer: Jeff Jirsa 
Committed: Tue Dec 12 09:55:39 2017 -0800

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 103 ---
 ...egacy_ka_repeated_rt-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 ...Keyspace1-legacy_ka_repeated_rt-ka-1-Data.db | Bin 0 -> 422 bytes
 ...pace1-legacy_ka_repeated_rt-ka-1-Digest.sha1 |   1 +
 ...yspace1-legacy_ka_repeated_rt-ka-1-Filter.db | Bin 0 -> 176 bytes
 ...eyspace1-legacy_ka_repeated_rt-ka-1-Index.db | Bin 0 -> 570 bytes
 ...ce1-legacy_ka_repeated_rt-ka-1-Statistics.db | Bin 0 -> 4478 bytes
 ...space1-legacy_ka_repeated_rt-ka-1-Summary.db | Bin 0 -> 92 bytes
 ...Keyspace1-legacy_ka_repeated_rt-ka-1-TOC.txt |   8 ++
 .../apache/cassandra/db/LegacyLayoutTest.java   | 100 ++
 11 files changed, 176 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05251454/CHANGES.txt
--
diff --cc CHANGES.txt
index 116c7e9,1ca7902..da40341
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.16
 +3.11.2
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Extra range tombstone bound creates double rows (CASSANDRA-14008)
   * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
   * Accept role names containing forward-slash (CASSANDRA-14088)
   * Optimize CRC check chance probability calculations (CASSANDRA-14094)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05251454/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
--
diff --cc test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
index 6103727,715d7c9..be695f2
--- a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
+++ b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
@@@ -19,12 -19,19 +19,22 @@@
  package org.apache.cassandra.db;
  
  import java.nio.ByteBuffer;
+ import java.nio.file.Files;
+ import java.nio.file.Path;
+ import java.nio.file.Paths;
  
++import org.junit.AfterClass;
++import org.junit.BeforeClass;
  import org.junit.Test;
  
+ import org.apache.cassandra.SchemaLoader;
++import org.apache.cassandra.Util;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.ColumnDefinition;
+ import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.cql3.ColumnIdentifier;
+ import org.apache.cassandra.cql3.QueryProcessor;
+ import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.SetType;
  import org.apache.cassandra.db.partitions.PartitionUpdate;
@@@ -37,6 -45,6 +48,24 @@@ import static org.junit.Assert.*
  
  public class LegacyLayoutTest
  {
++static Util.PartitionerSwitcher sw;
++static String KEYSPACE = "Keyspace1";
++
++@BeforeClass
++public static void setupPartitioner()
++{
++DatabaseDescriptor.daemonInitialization();
++sw = Util.switchPartitioner(Murmur3Partitioner.instance);
++SchemaLoader.loadSchema();
++SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1));
++}
++
++@AfterClass
++public static void resetPartitioner()
++{
++sw.close();
++}
++
  @Test
  public void testFromUnfilteredRowIterator() throws Throwable
  {
@@@ -70,4 -77,78 +99,75 @@@
  assertEquals("b", l.starts[1].collectionName.name.toString());

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

2017-12-07 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b637eb11c956698dc2ffb936eb85224e22dc7d94
Parents: cdcd652 a9225f9
Author: Paulo Motta 
Authored: Fri Dec 8 09:03:53 2017 +1100
Committer: Paulo Motta 
Committed: Fri Dec 8 09:04:56 2017 +1100

--
 CHANGES.txt |  1 +
 .../io/sstable/format/SSTableReader.java|  3 ++-
 .../apache/cassandra/cql3/SimpleQueryTest.java  | 20 
 3 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b637eb11/CHANGES.txt
--
diff --cc CHANGES.txt
index 691b285,a5a97db..18a22bd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
  3.0.16
+  * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
   * Accept role names containing forward-slash (CASSANDRA-14088)
   * Optimize CRC check chance probability calculations (CASSANDRA-14094)
   * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b637eb11/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b637eb11/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java
index c2de52a,f32bcc6..62fe5a1
--- a/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java
+++ b/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java
@@@ -547,42 -527,23 +547,62 @@@ public class SimpleQueryTest extends CQ
  );
  }
  
 +/** Test for Cassandra issue 10958 **/
 +@Test
 +public void restrictionOnRegularColumnWithStaticColumnPresentTest() 
throws Throwable
 +{
 +createTable("CREATE TABLE %s (id int, id2 int, age int static, extra 
int, PRIMARY KEY(id, id2))");
 +
 +execute("INSERT INTO %s (id, id2, age, extra) VALUES (?, ?, ?, ?)", 
1, 1, 1, 1);
 +execute("INSERT INTO %s (id, id2, age, extra) VALUES (?, ?, ?, ?)", 
2, 2, 2, 2);
 +execute("UPDATE %s SET age=? WHERE id=?", 3, 3);
 +
 +assertRows(execute("SELECT * FROM %s"),
 +row(1, 1, 1, 1),
 +row(2, 2, 2, 2),
 +row(3, null, 3, null)
 +);
 +
 +assertRows(execute("SELECT * FROM %s WHERE extra > 1 ALLOW 
FILTERING"),
 +row(2, 2, 2, 2)
 +);
 +}
 +
 +@Test
 +public void testRowFilteringOnStaticColumn() throws Throwable
 +{
 +createTable("CREATE TABLE %s (id int, name text, age int static, 
PRIMARY KEY (id, name))");
 +for (int i = 0; i < 5; i++)
 +{
 +execute("INSERT INTO %s (id, name, age) VALUES (?, ?, ?)", i, 
"NameDoesNotMatter", i);
 +}
 +
 +assertInvalid("SELECT id, age FROM %s WHERE age < 1");
 +assertRows(execute("SELECT id, age FROM %s WHERE age < 1 ALLOW 
FILTERING"),
 +   row(0, 0));
 +assertRows(execute("SELECT id, age FROM %s WHERE age > 0 AND age < 3 
ALLOW FILTERING"),
 +   row(1, 1), row(2, 2));
 +assertRows(execute("SELECT id, age FROM %s WHERE age > 3 ALLOW 
FILTERING"),
 +   row(4, 4));
 +}
++
+ @Test
+ public void testSStableTimestampOrdering() throws Throwable
+ {
+ createTable("CREATE TABLE %s (k1 int, v1 int, v2 int, PRIMARY KEY 
(k1))");
+ disableCompaction();
+ 
+ // sstable1
+ execute("INSERT INTO %s(k1,v1,v2) VALUES(1,1,1)  USING TIMESTAMP 5");
+ flush();
+ 
+ // sstable2
+ execute("INSERT INTO %s(k1,v1,v2) VALUES(1,1,2)  USING TIMESTAMP 8");
+ flush();
+ 
+ execute("INSERT INTO %s(k1) VALUES(1)  USING TIMESTAMP 7");
+ execute("DELETE FROM %s USING TIMESTAMP 6 WHERE k1 = 1");
+ 
+

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

2017-12-07 Thread jjirsa

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: cdcd6529d00c023eaaab4e075f56ffdaf7d774ad
Parents: 4e74f01 f9de26a
Author: Jeff Jirsa 
Authored: Thu Dec 7 13:20:37 2017 -0800
Committer: Jeff Jirsa 
Committed: Thu Dec 7 13:21:04 2017 -0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/auth/RoleResource.java |  4 ++--
 .../miscellaneous/RoleSyntaxTest.java   | 23 
 3 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdcd6529/CHANGES.txt
--
diff --cc CHANGES.txt
index 1a1a2cf,4a415eb..691b285
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,8 +1,17 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
  3.0.16
+  * Accept role names containing forward-slash (CASSANDRA-14088)
   * Optimize CRC check chance probability calculations (CASSANDRA-14094)
   * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 - * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Fix updating base table rows with TTL not removing view entries 
(CASSANDRA-14071)
   * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-12-06 Thread jjirsa

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4e74f01488e03d85516b68514388c32d3c78965c
Parents: c169d49 b885e9c
Author: Jeff Jirsa 
Authored: Wed Dec 6 21:56:22 2017 -0800
Committer: Jeff Jirsa 
Committed: Wed Dec 6 21:56:47 2017 -0800

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/io/util/CompressedChunkReader.java| 6 --
 .../cassandra/streaming/compress/CompressedInputStream.java| 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e74f014/CHANGES.txt
--
diff --cc CHANGES.txt
index 3c6565c,b275397..1a1a2cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,7 +1,16 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
  3.0.16
+  * Optimize CRC check chance probability calculations (CASSANDRA-14094)
   * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 - * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Fix updating base table rows with TTL not removing view entries 
(CASSANDRA-14071)
   * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e74f014/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
--
diff --cc src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
index 8f00ce7,000..0919c29
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
+++ b/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
@@@ -1,227 -1,0 +1,229 @@@
 +/*
 + * 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.io.util;
 +
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.concurrent.ThreadLocalRandom;
 +
 +import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.primitives.Ints;
 +
 +import org.apache.cassandra.io.compress.BufferType;
 +import org.apache.cassandra.io.compress.CompressionMetadata;
 +import org.apache.cassandra.io.compress.CorruptBlockException;
 +import org.apache.cassandra.io.sstable.CorruptSSTableException;
 +
 +public abstract class CompressedChunkReader extends AbstractReaderFileProxy 
implements ChunkReader
 +{
 +final CompressionMetadata metadata;
 +
 +protected CompressedChunkReader(ChannelProxy channel, CompressionMetadata 
metadata)
 +{
 +super(channel, metadata.dataLength);
 +this.metadata = metadata;
 +assert Integer.bitCount(metadata.chunkLength()) == 1; //must be a 
power of two
 +}
 +
 +@VisibleForTesting
 +public double getCrcCheckChance()
 +{
 +return metadata.parameters.getCrcCheckChance();
 +}
 +
 +@Override
 +public String toString()
 +{
 +return String.format("CompressedChunkReader.%s(%s - %s, chunk length 
%d, data length %d)",
 + getClass().getSimpleName(),
 + channel.filePath(),
 +

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

2017-12-06 Thread jjirsa

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c169d491ea46abeb3ab33fbae061fd73940db6f1
Parents: f77b663 090f418
Author: Jeff Jirsa 
Authored: Wed Dec 6 21:41:53 2017 -0800
Committer: Jeff Jirsa 
Committed: Wed Dec 6 21:42:56 2017 -0800

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 24 +++---
 .../org/apache/cassandra/db/CleanupTest.java| 80 
 3 files changed, 93 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c169d491/CHANGES.txt
--
diff --cc CHANGES.txt
index 8a7158d,9638886..3c6565c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
  3.0.16
+  * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 - * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Fix updating base table rows with TTL not removing view entries 
(CASSANDRA-14071)
   * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c169d491/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 0a2b461,fdda562..3351736
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -817,61 -651,6 +813,61 @@@ public class CompactionManager implemen
  FBUtilities.waitOnFutures(futures);
  }
  
 +public void forceUserDefinedCleanup(String dataFiles)
 +{
 +String[] filenames = dataFiles.split(",");
 +HashMap descriptors = 
Maps.newHashMap();
 +
 +for (String filename : filenames)
 +{
 +// extract keyspace and columnfamily name from filename
 +Descriptor desc = Descriptor.fromFilename(filename.trim());
 +if (Schema.instance.getCFMetaData(desc) == null)
 +{
 +logger.warn("Schema does not exist for file {}. Skipping.", 
filename);
 +continue;
 +}
 +// group by keyspace/columnfamily
 +ColumnFamilyStore cfs = 
Keyspace.open(desc.ksname).getColumnFamilyStore(desc.cfname);
 +desc = cfs.getDirectories().find(new 
File(filename.trim()).getName());
 +if (desc != null)
 +descriptors.put(cfs, desc);
 +}
 +
++if (!StorageService.instance.isJoined())
++{
++logger.error("Cleanup cannot run before a node has joined the 
ring");
++return;
++}
++
 +for (Map.Entry entry : 
descriptors.entrySet())
 +{
 +ColumnFamilyStore cfs = entry.getKey();
 +Keyspace keyspace = cfs.keyspace;
 +Collection ranges = 
StorageService.instance.getLocalRanges(keyspace.getName());
 +boolean hasIndexes = cfs.indexManager.hasIndexes();
 +SSTableReader sstable = lookupSSTable(cfs, entry.getValue());
 +
- if (ranges.isEmpty())
- {
- logger.error("Cleanup cannot run before a node has joined the 
ring");
- return;
- }
- 
 +if (sstable == null)
 +{
 +logger.warn("Will not clean {}, it is not an active sstable", 
entry.getValue());
 +}
 +else
 +{
 +CleanupStrategy cleanupStrategy = CleanupStrategy.get(cfs, 
ranges, FBUtilities.nowInSeconds());
 +try (LifecycleTransaction txn = 
cfs.getTracker().tryModify(sstable, OperationType.CLEANUP))
 +{
 +

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

2017-12-06 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f77b663d1ba370ed66d56e1558aa12460c6c6414
Parents: ae78231 461af5b
Author: Paulo Motta 
Authored: Thu Dec 7 08:17:24 2017 +1100
Committer: Paulo Motta 
Committed: Thu Dec 7 08:17:49 2017 +1100

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/cql3/Attributes.java   |   6 +
 .../org/apache/cassandra/db/LivenessInfo.java   |  62 -
 .../cassandra/db/view/ViewUpdateGenerator.java  |  10 +-
 .../apache/cassandra/schema/TableParams.java|   4 +
 .../apache/cassandra/tools/JsonTransformer.java |   2 +-
 .../org/apache/cassandra/cql3/ViewLongTest.java | 231 +++
 .../cql3/validation/operations/TTLTest.java | 104 +
 .../apache/cassandra/db/LivenessInfoTest.java   | 112 +
 9 files changed, 524 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f77b663d/CHANGES.txt
--
diff --cc CHANGES.txt
index 60215c4,54a8538..8a7158d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
  3.0.16
 - * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
++ * Fix updating base table rows with TTL not removing view entries 
(CASSANDRA-14071)
   * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f77b663d/src/java/org/apache/cassandra/db/LivenessInfo.java
--
diff --cc src/java/org/apache/cassandra/db/LivenessInfo.java
index b581f78,89e0578..5d17aea
--- a/src/java/org/apache/cassandra/db/LivenessInfo.java
+++ b/src/java/org/apache/cassandra/db/LivenessInfo.java
@@@ -68,10 -81,12 +76,12 @@@ public class LivenessInf
   : expiring(timestamp, ttl, nowInSec);
  }
  
 -// Note that this ctor ignores the default table ttl and takes the 
expiration time, not the current time.
 +// Note that this ctor takes the expiration time, not the current time.
  // Use when you know that's what you want.
 -public static LivenessInfo create(long timestamp, int ttl, int 
localExpirationTime)
 +public static LivenessInfo withExpirationTime(long timestamp, int ttl, 
int localExpirationTime)
  {
+ if (ttl == EXPIRED_LIVENESS_TTL)
+ return new ExpiredLivenessInfo(timestamp, ttl, 
localExpirationTime);
  return ttl == NO_TTL ? new LivenessInfo(timestamp) : new 
ExpiringLivenessInfo(timestamp, ttl, localExpirationTime);
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f77b663d/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
--
diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index a4a1252,74d3e52..7937e05
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@@ -403,11 -403,13 +403,13 @@@ public class ViewUpdateGenerato
  if (timestamp > rowDeletion)
  {
  /**
-   * TODO: This is a hack and overload of LivenessInfo and we 
should probably modify
-   * the storage engine to properly support this, but on the 
meantime this
-   * should be fine because it only happens in some specific 
scenarios explained above.
+   * We use an expired liveness instead of a row tombstone to 
allow a shadowed MV
+   * entry to co-exist with a row tombstone, see 
ViewComplexTest#testCommutativeRowDeletion.
+   *
+   * TODO This is a dirty overload

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

2017-12-05 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ae782319b59266080cc85b3fd3210cdf39a4353a
Parents: c3a1a4f 10ca7e4
Author: Blake Eggleston 
Authored: Tue Dec 5 16:06:15 2017 -0800
Committer: Blake Eggleston 
Committed: Tue Dec 5 16:06:15 2017 -0800

--
 CHANGES.txt |  2 ++
 .../cassandra/locator/DynamicEndpointSnitch.java| 16 
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae782319/CHANGES.txt
--
diff --cc CHANGES.txt
index 7c0af91,cf8883a..60215c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,14 @@@
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+ 3.0.16
+  * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)
   * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae782319/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--
diff --cc src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index e9c8e6f,8c255f5..42fc26c
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@@ -30,12 -29,9 +30,13 @@@ import com.codahale.metrics.Exponential
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
  
+ import com.codahale.metrics.Snapshot;
  import org.apache.cassandra.concurrent.ScheduledExecutors;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.gms.ApplicationState;
 +import org.apache.cassandra.gms.EndpointState;
 +import org.apache.cassandra.gms.Gossiper;
 +import org.apache.cassandra.gms.VersionedValue;
  import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.FBUtilities;


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-12-05 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c3a1a4fa8083b2c4c6a5454551979954a0a71339
Parents: d577918 05cb556
Author: Jason Brown 
Authored: Tue Dec 5 05:07:18 2017 -0800
Committer: Jason Brown 
Committed: Tue Dec 5 05:08:22 2017 -0800

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml | 10 +-
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 10 ++
 .../AbstractCommitLogSegmentManager.java|  8 +-
 .../db/commitlog/AbstractCommitLogService.java  | 84 ++---
 .../cassandra/db/commitlog/CommitLog.java   |  4 +-
 .../db/commitlog/CommitLogSegment.java  | 85 +++--
 .../db/commitlog/CompressedSegment.java |  4 +-
 .../db/commitlog/EncryptedSegment.java  |  3 -
 .../db/commitlog/FileDirectSegment.java | 14 +++
 .../db/commitlog/MemoryMappedSegment.java   |  4 +
 .../db/commitlog/PeriodicCommitLogService.java  |  2 +-
 .../commitlog/CommitLogChainedMarkersTest.java  | 98 
 .../CommitLogSegmentBackpressureTest.java   |  4 +-
 .../cassandra/db/commitlog/CommitLogTest.java   | 10 +-
 .../db/commitlog/CommitLogTestReplayer.java |  2 +-
 17 files changed, 281 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3a1a4fa/CHANGES.txt
--
diff --cc CHANGES.txt
index e26aeb8,2683dc2..7c0af91
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -3.0.16
 +3.11.2
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)
   * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
   * Fix SSTableLoader logger message (CASSANDRA-14003)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3a1a4fa/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index a01203c,0796183..5fe752e
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -198,8 -190,9 +198,9 @@@ public class Confi
  public String commitlog_directory;
  public Integer commitlog_total_space_in_mb;
  public CommitLogSync commitlog_sync;
 -public Double commitlog_sync_batch_window_in_ms;
 -public Integer commitlog_sync_period_in_ms;
 -public Integer commitlog_marker_period_in_ms = 0;
 +public double commitlog_sync_batch_window_in_ms = Double.NaN;
 +public int commitlog_sync_period_in_ms;
++public int commitlog_marker_period_in_ms = 0;
  public int commitlog_segment_size_in_mb = 32;
  public ParameterizedClass commitlog_compression;
  public int commitlog_max_compression_buffers_in_pool = 3;

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3a1a4fa/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
index 7f3c9f8,000..2c324aa
mode 100755,00..100755
--- 
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++ 
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@@ -1,550 -1,0 +1,552 @@@
 +/*
 + * 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
 +

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

2017-11-18 Thread slebresne

Merge branch 'cassandra-3.0' into cassandra-3.11

* cassandra-3.0:
  Fix serialized size of DataLimits


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

Branch: refs/heads/cassandra-3.11
Commit: d2bc37f43db14661a159406e421985a2484d5387
Parents: 9ee44db eb05025
Author: Sylvain Lebresne 
Authored: Sat Nov 18 14:17:43 2017 +0100
Committer: Sylvain Lebresne 
Committed: Sat Nov 18 14:17:43 2017 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/TypeSizes.java | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2bc37f4/CHANGES.txt
--
diff --cc CHANGES.txt
index a1a1a37,6c50a3f..3fc934e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.16
 +3.11.2
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Fix serialized size of DataLimits (CASSANDRA-14057)
   * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
   * Fix SSTableLoader logger message (CASSANDRA-14003)
   * Fix repair race that caused gossip to block (CASSANDRA-13849)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-11-13 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 9ee44db49b13d4b4c91c9d6332ce06a6e2abf944
Parents: 387d3a4 f1e850a
Author: Aleksey Yeschenko 
Authored: Mon Nov 13 13:13:06 2017 +
Committer: Aleksey Yeschenko 
Committed: Mon Nov 13 13:13:06 2017 +

--
 CHANGES.txt |  1 +
 .../apache/cassandra/metrics/TableMetrics.java  |  2 +
 .../apache/cassandra/service/DataResolver.java  | 53 +---
 3 files changed, 48 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ee44db4/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a78b60,a3c43fd..a1a1a37
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.16
 +3.11.2
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
   * Fix SSTableLoader logger message (CASSANDRA-14003)
   * Fix repair race that caused gossip to block (CASSANDRA-13849)
   * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ee44db4/src/java/org/apache/cassandra/metrics/TableMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/TableMetrics.java
index b0f667c,eb56ed9..e78bb66
--- a/src/java/org/apache/cassandra/metrics/TableMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java
@@@ -167,40 -151,7 +167,41 @@@ public class TableMetric
  public final static LatencyMetrics globalWriteLatency = new 
LatencyMetrics(globalFactory, globalAliasFactory, "Write");
  public final static LatencyMetrics globalRangeLatency = new 
LatencyMetrics(globalFactory, globalAliasFactory, "Range");
  
 +public final static Gauge globalPercentRepaired = 
Metrics.register(globalFactory.createMetricName("PercentRepaired"),
 +new Gauge()
 +{
 +public Double getValue()
 +{
 +double repaired = 0;
 +double total = 0;
 +for (String keyspace : Schema.instance.getNonSystemKeyspaces())
 +{
 +Keyspace k = Schema.instance.getKeyspaceInstance(keyspace);
 +if 
(SchemaConstants.DISTRIBUTED_KEYSPACE_NAME.equals(k.getName()))
 +continue;
 +if (k.getReplicationStrategy().getReplicationFactor() < 2)
 +continue;
 +
 +for (ColumnFamilyStore cf : k.getColumnFamilyStores())
 +{
 +if (!SecondaryIndexManager.isIndexColumnFamily(cf.name))
 +{
 +for (SSTableReader sstable : 
cf.getSSTables(SSTableSet.CANONICAL))
 +{
 +if (sstable.isRepaired())
 +{
 +repaired += sstable.uncompressedLength();
 +}
 +total += sstable.uncompressedLength();
 +}
 +}
 +}
 +}
 +return total > 0 ? (repaired / total) * 100 : 100.0;
 +}
 +});
 +
+ public final Meter readRepairRequests;
  public final Meter shortReadProtectionRequests;
  
  public final Map samplers;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ee44db4/src/java/org/apache/cassandra/service/DataResolver.java
--
diff --cc src/java/org/apache/cassandra/service/DataResolver.java
index 111d561,f02b565..f63f4f5
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@@ -44,15 -44,17 +44,18 @@@ import org.apache.cassandra.utils.FBUti
  
  public class DataResolver extends ResponseResolver
  {
+ private static final boolean DROP_OVERSIZED_READ_REPAIR_MUTATIONS =
+ Boolean.getBoolean("cassandra.drop_oversized_readrepair_mutations");
+ 
  @VisibleForTesting
  final List repairResults = 
Collections.synchronizedList(new ArrayList<>());

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

2017-11-09 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 387d3a4eba9fc1346266a30f27db6e29f049a82e
Parents: 7d6474b f767d35
Author: Blake Eggleston 
Authored: Thu Nov 9 10:07:53 2017 -0800
Committer: Blake Eggleston 
Committed: Thu Nov 9 10:07:53 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/CHANGES.txt
--
diff --cc CHANGES.txt
index 6bd6de8,e3026aa..6a78b60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.16
 +3.11.2
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Fix SSTableLoader logger message (CASSANDRA-14003)
   * Fix repair race that caused gossip to block (CASSANDRA-13849)
   * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
   * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-11-08 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7d6474bb4d5e8fe940ad0a75652524ca221dab62
Parents: df37bcb 49edd70
Author: Blake Eggleston 
Authored: Wed Nov 8 16:40:38 2017 -0800
Committer: Blake Eggleston 
Committed: Wed Nov 8 16:42:13 2017 -0800

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/service/ActiveRepairService.java   | 9 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d6474bb/CHANGES.txt
--
diff --cc CHANGES.txt
index 83015b1,a94dbc9..6bd6de8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.16
 +3.11.2
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Fix repair race that caused gossip to block (CASSANDRA-13849)
   * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
   * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
   * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d6474bb/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index fea690e,adb6fab..626aa91
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -283,9 -280,9 +283,9 @@@ public class ActiveRepairService implem
  return neighbors;
  }
  
- public synchronized UUID prepareForRepair(UUID parentRepairSession, 
InetAddress coordinator, Set endpoints, RepairOption options, 
List columnFamilyStores)
+ public UUID prepareForRepair(UUID parentRepairSession, InetAddress 
coordinator, Set endpoints, RepairOption options, 
List columnFamilyStores)
  {
 -long timestamp = System.currentTimeMillis();
 +long timestamp = Clock.instance.currentTimeMillis();
  registerParentRepairSession(parentRepairSession, coordinator, 
columnFamilyStores, options.getRanges(), options.isIncremental(), timestamp, 
options.isGlobal());
  final CountDownLatch prepareLatch = new 
CountDownLatch(endpoints.size());
  final AtomicBoolean status = new AtomicBoolean(true);


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-11-07 Thread samt

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ab6201c65b193c2df4c2f25f779a591c917b1df8
Parents: 6d429cd 58daf13
Author: Sam Tunnicliffe 
Authored: Tue Nov 7 13:59:20 2017 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 7 13:59:20 2017 +

--
 CHANGES.txt |  1 +
 .../apache/cassandra/dht/RandomPartitioner.java | 43 ++--
 .../org/apache/cassandra/utils/FBUtilities.java | 19 -
 3 files changed, 40 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab6201c6/CHANGES.txt
--
diff --cc CHANGES.txt
index 275294f,3f4f3f2..1269dcf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.16
 +3.11.2
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
   * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
   * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
   * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab6201c6/src/java/org/apache/cassandra/dht/RandomPartitioner.java
--
diff --cc src/java/org/apache/cassandra/dht/RandomPartitioner.java
index 82c2493,c7837c9..bdf8b85
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@@ -117,20 -103,7 +141,20 @@@ public class RandomPartitioner implemen
  return new BigIntegerToken(token);
  }
  
 -private final Token.TokenFactory tokenFactory = new Token.TokenFactory() {
 +public BigIntegerToken getRandomToken(Random random)
 +{
- BigInteger token = 
FBUtilities.hashToBigInteger(GuidGenerator.guidAsBytes(random, 
"host/127.0.0.1", 0));
++BigInteger token = hashToBigInteger(GuidGenerator.guidAsBytes(random, 
"host/127.0.0.1", 0));
 +if ( token.signum() == -1 )
 +token = token.multiply(BigInteger.valueOf(-1L));
 +return new BigIntegerToken(token);
 +}
 +
 +private boolean isValidToken(BigInteger token) {
 +return token.compareTo(ZERO) >= 0 && token.compareTo(MAXIMUM) <= 0;
 +}
 +
 +private final Token.TokenFactory tokenFactory = new Token.TokenFactory()
 +{
  public ByteBuffer toByteArray(Token token)
  {
  BigIntegerToken bigIntegerToken = (BigIntegerToken) token;
@@@ -275,9 -230,14 +300,19 @@@
  return partitionOrdering;
  }
  
 +public Optional splitter()
 +{
 +return Optional.of(splitter);
 +}
 +
+ private static BigInteger hashToBigInteger(ByteBuffer data)
+ {
+ MessageDigest messageDigest = localMD5Digest.get();
+ if (data.hasArray())
+ messageDigest.update(data.array(), data.arrayOffset() + 
data.position(), data.remaining());
+ else
+ messageDigest.update(data.duplicate());
+ 
+ return new BigInteger(messageDigest.digest()).abs();
+ }
  }

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-10-26 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ea443dfe3ed8d154c11856bb9f5189afc3f7236f
Parents: 7d26815 b869744
Author: Blake Eggleston 
Authored: Thu Oct 26 14:03:33 2017 -0700
Committer: Blake Eggleston 
Committed: Thu Oct 26 14:03:33 2017 -0700

--
 CHANGES.txt|  1 +
 NEWS.txt   |  8 
 conf/cassandra.yaml|  4 
 src/java/org/apache/cassandra/config/Config.java   |  3 +++
 .../cassandra/config/DatabaseDescriptor.java   |  5 +
 .../cql3/statements/CreateViewStatement.java   | 17 +
 6 files changed, 38 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/CHANGES.txt
--
diff --cc CHANGES.txt
index 532c958,935931c..275294f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.16
 +3.11.2
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
   * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
   * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
   * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/NEWS.txt
--
diff --cc NEWS.txt
index 96285c7,60cf77c..f8dd93b
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,10 -18,19 +18,18 @@@ using the provided 'sstableupgrade' too
  
  Upgrading
  -
 -   - Nothing specific to this release, but please see previous upgrading 
sections,
 - especially if you are upgrading from 2.2.
 +- Nothing specific to this release, but please see previous upgrading 
sections.
  
+ Materialized Views
+ ---
+- Following a discussion regarding concerns about the design and safety of 
Materialized Views, the C* development
+  community no longer recommends them for production use, and considers 
them experimental. Warnings messages will
+  now be logged when they are created. (See 
https://www.mail-archive.com/dev@cassandra.apache.org/msg11511.html)
+- An 'enable_materialized_views' flag has been added to cassandra.yaml to 
allow operators to prevent creation of
+  views
+ 
 -3.0.15
 -=
 +3.11.1
 +==
  
  Upgrading
  -

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index 9489af9,64d41bb..a01203c
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -323,22 -303,14 +323,25 @@@ public class Confi
   */
  public static final int otc_backlog_expiration_interval_ms_default = 200;
  public volatile int otc_backlog_expiration_interval_ms = 
otc_backlog_expiration_interval_ms_default;
 - 
 +
  public int windows_timer_interval = 0;
  
 +/**
 + * Size of the CQL prepared statements cache in MB.
 + * Defaults to 1/256th of the heap size or 10MB, whichever is greater.
 + */
 +public Long prepared_statements_cache_size_mb = null;
 +/**
 + * Size of the Thrift prepared statements cache in MB.
 + * Defaults to 1/256th of the heap size or 10MB, whichever is greater.
 + */
 +public Long thrift_prepared_statements_cache_size_mb = null;
 +
  public boolean enable_user_defined_functions = false;
  public boolean enable_scripted_user_defined_functions = false;
+ 
+ public boolean enable_materialized_views = true;
+ 
  /**
   * Optionally disable asynchronous UDF execution.
   * Disabling asynchronous UDF execution also implicitly disables the 
security-manager!

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

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

2017-10-26 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7d26815c5e270c4e142df868ab8e9c44be022595
Parents: 5b23054 8fad4cd
Author: Blake Eggleston 
Authored: Thu Oct 26 13:35:21 2017 -0700
Committer: Blake Eggleston 
Committed: Thu Oct 26 13:37:00 2017 -0700

--
 .../CommitLogSegmentBackpressureTest.java   | 145 
 .../commitlog/CommitLogSegmentManagerTest.java  | 172 ---
 .../db/commitlog/CommitlogShutdownTest.java |  99 +++
 3 files changed, 244 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d26815c/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java
index 000,b651098..3956de5
mode 00,100644..100644
--- 
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java
+++ 
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java
@@@ -1,0 -1,140 +1,145 @@@
+ /*
+  *
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  *
+  */
+ package org.apache.cassandra.db.commitlog;
+ 
+ import java.nio.ByteBuffer;
++import java.util.ArrayList;
+ import java.util.Random;
+ import java.util.concurrent.Semaphore;
+ 
+ import com.google.common.collect.ImmutableMap;
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.Util;
+ import org.apache.cassandra.config.Config.CommitLogSync;
+ import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.config.ParameterizedClass;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.Mutation;
+ import org.apache.cassandra.db.RowUpdateBuilder;
+ import org.apache.cassandra.db.compaction.CompactionManager;
+ import org.apache.cassandra.db.marshal.AsciiType;
+ import org.apache.cassandra.db.marshal.BytesType;
+ import org.apache.cassandra.schema.KeyspaceParams;
+ import org.jboss.byteman.contrib.bmunit.BMRule;
+ import org.jboss.byteman.contrib.bmunit.BMRules;
+ import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
+ 
+ /**
+  * Since this test depends on byteman rules being setup during 
initialization, you shouldn't add tests to this class
+  */
+ @RunWith(BMUnitRunner.class)
+ public class CommitLogSegmentBackpressureTest
+ {
+ //Block commit log service from syncing
+ private static final Semaphore allowSync = new Semaphore(1);
+ 
+ private static final String KEYSPACE1 = "CommitLogTest";
+ private static final String STANDARD1 = "Standard1";
+ private static final String STANDARD2 = "Standard2";
+ 
+ private final static byte[] entropy = new byte[1024 * 256];
+ 
+ @Test
+ @BMRules(rules = {@BMRule(name = "Acquire Semaphore before sync",
+   targetClass = "AbstractCommitLogService$1",
+   targetMethod = "run",
+   targetLocation = "AT INVOKE 
org.apache.cassandra.db.commitlog.CommitLog.sync",
+   action = 
"org.apache.cassandra.db.commitlog.CommitLogSegmentBackpressureTest.allowSync.acquire()"),
+   @BMRule(name = "Release Semaphore after sync",
+   targetClass = "AbstractCommitLogService$1",
+   targetMethod = "run",
+   targetLocation = "AFTER INVOKE 
org.apache.cassandra.db.commitlog.CommitLog.sync",
+   action =

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

2017-10-17 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f5e8d1672ce4c1d83fd66955a2fc9de995ef4c04
Parents: 394fb0b 9e37967
Author: Aleksey Yeschenko 
Authored: Tue Oct 17 13:32:44 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 17 13:32:44 2017 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/Schema.java |  4 +-
 .../cassandra/config/SchemaConstants.java   | 20 ++---
 .../cql3/statements/AlterKeyspaceStatement.java |  2 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 +-
 src/java/org/apache/cassandra/db/Keyspace.java  |  4 +-
 .../org/apache/cassandra/db/ReadCommand.java|  2 +-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../cassandra/schema/LegacySchemaMigrator.java  |  2 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |  6 +--
 .../apache/cassandra/service/ClientState.java   | 44 +++-
 .../apache/cassandra/service/StorageProxy.java  |  2 +-
 .../cassandra/service/StorageService.java   | 16 +--
 .../cassandra/thrift/ThriftValidation.java  |  2 +-
 .../cassandra/tools/nodetool/Cleanup.java   |  2 +-
 15 files changed, 67 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e8d167/CHANGES.txt
--
diff --cc CHANGES.txt
index 9a8dd05,75f2c29..62525f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.16
 +3.11.2
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
   * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
   * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
   * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e8d167/src/java/org/apache/cassandra/config/Schema.java
--
diff --cc src/java/org/apache/cassandra/config/Schema.java
index ec6974d,6d91d8d..8fc83df
--- a/src/java/org/apache/cassandra/config/Schema.java
+++ b/src/java/org/apache/cassandra/config/Schema.java
@@@ -296,7 -344,7 +296,7 @@@ public class Schem
  
  private Set getNonSystemKeyspacesSet()
  {
- return Sets.difference(keyspaces.keySet(), 
SchemaConstants.SYSTEM_KEYSPACE_NAMES);
 -return Sets.difference(keyspaces.keySet(), 
LOCAL_SYSTEM_KEYSPACE_NAMES);
++return Sets.difference(keyspaces.keySet(), 
SchemaConstants.LOCAL_SYSTEM_KEYSPACE_NAMES);
  }
  
  /**
@@@ -334,7 -382,7 +334,7 @@@
  
  keyspaces.values()
   .stream()
-  .filter(k -> !SchemaConstants.isSystemKeyspace(k.name))
 - .filter(k -> !Schema.isLocalSystemKeyspace(k.name))
++ .filter(k -> !SchemaConstants.isLocalSystemKeyspace(k.name))
   .forEach(builder::add);
  
  return builder.build();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e8d167/src/java/org/apache/cassandra/config/SchemaConstants.java
--
diff --cc src/java/org/apache/cassandra/config/SchemaConstants.java
index 2416d6b,000..9e60b60
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/config/SchemaConstants.java
+++ b/src/java/org/apache/cassandra/config/SchemaConstants.java
@@@ -1,74 -1,0 +1,82 @@@
 +/*
 + * 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.config;
 +
 +import java.security.MessageDigest;

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

2017-10-17 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 394fb0bab6f90fbb8bb133e37b14b8bae85fb388
Parents: aee02e4 d8a18f9
Author: Aleksey Yeschenko 
Authored: Tue Oct 17 11:52:45 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 17 11:54:41 2017 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/Schema.java | 12 
 .../apache/cassandra/schema/SchemaKeyspace.java | 18 ++-
 .../cassandra/service/StorageService.java   |  6 
 .../cassandra/service/StorageServiceMBean.java  |  2 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 +++
 .../org/apache/cassandra/tools/NodeTool.java|  1 +
 .../tools/nodetool/ReloadLocalSchema.java   | 32 
 8 files changed, 76 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 81444d2,db3f502..9a8dd05
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.16
 +3.11.2
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
+  * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
   * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
   * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/config/Schema.java
--
diff --cc src/java/org/apache/cassandra/config/Schema.java
index c6fc2a8,cc24e1e..ec6974d
--- a/src/java/org/apache/cassandra/config/Schema.java
+++ b/src/java/org/apache/cassandra/config/Schema.java
@@@ -325,9 -365,21 +325,21 @@@ public class Schem
   */
  public List getUserKeyspaces()
  {
 -return 
ImmutableList.copyOf(Sets.difference(getNonSystemKeyspacesSet(), 
REPLICATED_SYSTEM_KEYSPACE_NAMES));
 +return 
ImmutableList.copyOf(Sets.difference(getNonSystemKeyspacesSet(), 
SchemaConstants.REPLICATED_SYSTEM_KEYSPACE_NAMES));
  }
  
+ public Keyspaces getReplicatedKeyspaces()
+ {
+ Keyspaces.Builder builder = Keyspaces.builder();
+ 
+ keyspaces.values()
+  .stream()
 - .filter(k -> !Schema.isSystemKeyspace(k.name))
++ .filter(k -> !SchemaConstants.isSystemKeyspace(k.name))
+  .forEach(builder::add);
+ 
+ return builder.build();
+ }
+ 
  /**
   * Get metadata about keyspace inner ColumnFamilies
   *

http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index fd13d8d,743ed24..2c17fb8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -83,8 -76,8 +83,9 @@@ import org.apache.cassandra.metrics.Sto
  import org.apache.cassandra.net.*;
  import org.apache.cassandra.repair.*;
  import org.apache.cassandra.repair.messages.RepairOption;
 +import org.apache.cassandra.schema.CompactionParams.TombstoneOption;
  import org.apache.cassandra.schema.KeyspaceMetadata;
+ import org.apache.cassandra.schema.SchemaKeyspace;
  import org.apache.cassandra.service.paxos.CommitVerbHandler;
  import org.apache.cassandra.service.paxos.PrepareVerbHandler;
  import org.apache.cassandra.service.paxos.ProposeVerbHandler;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/tools/NodeTool.java
--

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

2017-10-04 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f5bc42996b671ae26793691af3fd06fbcabbe4cc
Parents: 983c72a e400b97
Author: Marcus Eriksson 
Authored: Wed Oct 4 08:18:36 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Oct 4 08:19:15 2017 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/compaction/Verifier.java   | 31 
 .../org/apache/cassandra/db/VerifyTest.java | 26 
 3 files changed, 53 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5bc4299/CHANGES.txt
--
diff --cc CHANGES.txt
index aca219e,df05f7f..4a22af4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,8 +1,18 @@@
 -3.0.16
 -  * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 -
 -
 -3.0.15
 +3.11.1
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
++ * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
   * Improve TRUNCATE performance (CASSANDRA-13909)
   * Implement short read protection on partition boundaries (CASSANDRA-13595)
   * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5bc4299/src/java/org/apache/cassandra/db/compaction/Verifier.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/Verifier.java
index df659e4,68088b3..4c07bb6
--- a/src/java/org/apache/cassandra/db/compaction/Verifier.java
+++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java
@@@ -88,7 -89,21 +90,21 @@@ public class Verifier implements Closea
  {
  long rowStart = 0;
  
 -outputHandler.output(String.format("Verifying %s (%s bytes)", 
sstable, dataFile.length()));
 +outputHandler.output(String.format("Verifying %s (%s)", sstable, 
FBUtilities.prettyPrintMemory(dataFile.length(;
+ outputHandler.output(String.format("Deserializing sstable metadata 
for %s ", sstable));
+ try
+ {
+ EnumSet types = EnumSet.of(MetadataType.VALIDATION, 
MetadataType.STATS, MetadataType.HEADER);
+ Map sstableMetadata = 
sstable.descriptor.getMetadataSerializer().deserialize(sstable.descriptor, 
types);
+ if (sstableMetadata.containsKey(MetadataType.VALIDATION) &&
+ 
!((ValidationMetadata)sstableMetadata.get(MetadataType.VALIDATION)).partitioner.equals(sstable.getPartitioner().getClass().getCanonicalName()))
+ throw new IOException("Partitioner does not match validation 
metadata");
+ }
+ catch (Throwable t)
+ {
+ outputHandler.debug(t.getMessage());
+ markAndThrow(false);
+ }
  outputHandler.output(String.format("Checking computed hash of %s ", 
sstable));
  
  
@@@ -187,8 -202,8 +203,8 @@@
  if (key == null || dataSize > dataFile.length())
  markAndThrow();
  
- //mimic the scrub read path
+ //mimic the scrub read path, intentionally unused
 -try (UnfilteredRowIterator iterator = new 
SSTableIdentityIterator(sstable, dataFile, key))
 +try (UnfilteredRowIterator iterator = 
SSTableIdentityIterator.create(sstable, dataFile, key))
  {

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

2017-10-02 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 983c72a84ab6628e09a78ead9e20a0c323a005af
Parents: 9d56132 b32a9e6
Author: Marcus Eriksson 
Authored: Mon Oct 2 09:34:49 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Oct 2 09:34:49 2017 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/lifecycle/Helpers.java  | 15 +
 .../apache/cassandra/db/lifecycle/LogFile.java  | 26 
 .../cassandra/db/lifecycle/LogRecord.java   | 65 +++-
 .../cassandra/db/lifecycle/LogTransaction.java  | 16 +
 .../apache/cassandra/db/lifecycle/Tracker.java  |  2 +-
 .../cassandra/db/lifecycle/HelpersTest.java | 58 -
 7 files changed, 180 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/983c72a8/CHANGES.txt
--
diff --cc CHANGES.txt
index 264887b,d6423b4..aca219e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -3.0.15
 +3.11.1
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Improve TRUNCATE performance (CASSANDRA-13909)
   * Implement short read protection on partition boundaries (CASSANDRA-13595)
   * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)
   * Filter header only commit logs before recovery (CASSANDRA-13918)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/983c72a8/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
--
diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java
index 9691ee9,be26163..123dd8a
--- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
@@@ -285,6 -285,25 +286,26 @@@ final class LogFile implements AutoClos
  throw new IllegalStateException();
  }
  
+ public void addAll(Type type, Iterable toBulkAdd)
+ {
+ for (LogRecord record : makeRecords(type, toBulkAdd))
+ if (!addRecord(record))
+ throw new IllegalStateException();
+ }
+ 
+ private Collection makeRecords(Type type, 
Iterable tables)
+ {
+ assert type == Type.ADD || type == Type.REMOVE;
+ 
+ for (SSTableReader sstable : tables)
+ {
 -File folder = sstable.descriptor.directory;
 -replicas.maybeCreateReplica(folder, getFileName(folder), records);
++File directory = sstable.descriptor.directory;
++String fileName = StringUtils.join(directory, File.separator, 
getFileName());
++replicas.maybeCreateReplica(directory, fileName, records);
+ }
+ return LogRecord.make(type, tables);
+ }
+ 
  private LogRecord makeRecord(Type type, SSTable table)
  {
  assert type == Type.ADD || type == Type.REMOVE;
@@@ -417,15 -417,26 +438,20 @@@
  return replicas.getFilePaths();
  }
  
 -private String getFileName(File folder)
 -{
 -String fileName = StringUtils.join(BigFormat.latestVersion,
 -   LogFile.SEP,
 -   "txn",
 -   LogFile.SEP,
 -   type.fileName,
 -   LogFile.SEP,
 -   id.toString(),
 -

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

2017-09-29 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: be2117492f3d9ace24bbf18e57e94b2a08965763
Parents: 2a24acf 95839aa
Author: Blake Eggleston 
Authored: Fri Sep 29 15:31:37 2017 -0700
Committer: Blake Eggleston 
Committed: Fri Sep 29 15:32:32 2017 -0700

--
 CHANGES.txt |  2 +-
 .../cassandra/db/commitlog/CommitLogReader.java | 53 +++-
 .../db/commitlog/CommitLogReplayer.java |  3 --
 .../db/commitlog/CommitLogSegment.java  |  2 +-
 .../db/commitlog/CompressedSegment.java |  2 +-
 .../db/commitlog/EncryptedSegment.java  |  4 +-
 .../db/commitlog/MemoryMappedSegment.java   |  2 +-
 .../cassandra/db/commitlog/CommitLogTest.java   | 53 
 8 files changed, 110 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be211749/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c3a1d0,7ff61d3..a782333
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,9 +1,20 @@@
 -3.0.15
 +3.11.1
- ===
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Filter header only commit logs before recovery (CASSANDRA-13918)
   * AssertionError prepending to a list (CASSANDRA-13149)
   * Fix support for SuperColumn tables (CASSANDRA-12373)
 - * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 - * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
   * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/be211749/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
index 8c04329,000..4d74557
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
@@@ -1,515 -1,0 +1,564 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.db.commitlog;
 +
 +import java.io.*;
 +import java.util.*;
 +import java.util.concurrent.atomic.AtomicInteger;
 +import java.util.zip.CRC32;
 +
 +import com.google.common.annotations.VisibleForTesting;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import

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

2017-09-29 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2a24acfa9926408216f5fde325abe0a8fd6b608a
Parents: 0bc45aa ab0adf9
Author: Jason Brown 
Authored: Fri Sep 29 05:21:32 2017 -0700
Committer: Jason Brown 
Committed: Fri Sep 29 05:24:11 2017 -0700

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/cql3/Lists.java   |  76 +++--
 .../org/apache/cassandra/cql3/ListsTest.java| 166 +++
 3 files changed, 226 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a24acfa/CHANGES.txt
--
diff --cc CHANGES.txt
index 80a8295,a1f49cd..6c3a1d0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,8 +1,20 @@@
 -3.0.15
 +3.11.1
 +===
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * AssertionError prepending to a list (CASSANDRA-13149)
   * Fix support for SuperColumn tables (CASSANDRA-12373)
 - * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 - * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
   * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a24acfa/src/java/org/apache/cassandra/cql3/Lists.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a24acfa/test/unit/org/apache/cassandra/cql3/ListsTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/ListsTest.java
index 000,9ca0010..07623a2
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/cql3/ListsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ListsTest.java
@@@ -1,0 -1,166 +1,166 @@@
+ /*
+  * 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.cql3;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+ import java.util.UUID;
+ 
+ import com.google.common.collect.Iterators;
+ import org.junit.Assert;
+ import org.junit.Test;
+ 
+ import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.ColumnDefinition;
+ import org.apache.cassandra.cql3.Lists.PrecisionTime;
+ import org.apache.cassandra.db.Clustering;
+ import org.apache.cassandra.db.DecoratedKey;
+ import org.apache.cassandra.db.rows.Cell;
+ import org.apache.cassandra.db.rows.Row;
+ import

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

2017-09-22 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 0e5c84ad8f5b43ff98b72ccdc62718bb2795b711
Parents: de6f21f 51e6f24
Author: Paulo Motta 
Authored: Fri Sep 22 09:42:36 2017 -0500
Committer: Paulo Motta 
Committed: Fri Sep 22 09:42:43 2017 -0500

--
 .../cassandra/triggers/TriggerExecutor.java |  7 -
 .../cassandra/triggers/TriggerExecutorTest.java | 25 
 .../apache/cassandra/triggers/TriggersTest.java | 30 
 3 files changed, 43 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/test/unit/org/apache/cassandra/triggers/TriggersTest.java
--
diff --cc test/unit/org/apache/cassandra/triggers/TriggersTest.java
index e5a2dd6,67619dc..165a7fe
--- a/test/unit/org/apache/cassandra/triggers/TriggersTest.java
+++ b/test/unit/org/apache/cassandra/triggers/TriggersTest.java
@@@ -192,10 -194,12 +192,10 @@@ public class TriggersTes
 org.apache.cassandra.thrift.ConsistencyLevel.LOCAL_SERIAL,
 org.apache.cassandra.thrift.ConsistencyLevel.ONE);
  
- assertUpdateIsAugmented(6);
+ assertUpdateIsAugmented(6, "v1", 6);
  }
  
 -// Unfortunately, an IRE thrown from StorageProxy.cas
 -// results in a RuntimeException from QueryProcessor.process
 -@Test(expected=RuntimeException.class)
 +
@Test(expected=org.apache.cassandra.exceptions.InvalidRequestException.class)
  public void 
onCqlUpdateWithConditionsRejectGeneratedUpdatesForDifferentPartition() throws 
Exception
  {
  String cf = "cf" + System.nanoTime();


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-21 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: de6f21f5877d39f99edf9ff1cafaf1de50855905
Parents: 85514ed 2b897d2
Author: Aleksey Yeschenko 
Authored: Thu Sep 21 17:02:15 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Sep 21 17:02:15 2017 +0100

--
 src/java/org/apache/cassandra/service/DataResolver.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-20 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 85514ed9e652de5c5e83e74a9199bbfbd2c3e3e2
Parents: 2bae4ca 36bdc25
Author: Aleksey Yeschenko 
Authored: Wed Sep 20 18:44:45 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Sep 20 18:44:45 2017 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/StorageProxy.java  | 25 +---
 .../cassandra/service/StorageService.java   | 18 +++---
 3 files changed, 32 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85514ed9/CHANGES.txt
--
diff --cc CHANGES.txt
index 8d07cbc,91f5a51..eb2ccc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
   * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)

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

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-20 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2bae4ca907ac4d2ab53c899e5cf5c9e4de631f52
Parents: c1efaf3 f93e6e3
Author: Aleksey Yeschenko 
Authored: Wed Sep 20 17:41:07 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Sep 20 17:41:07 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |   5 +
 .../apache/cassandra/service/DataResolver.java  | 304 +++
 3 files changed, 187 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bae4ca9/CHANGES.txt
--
diff --cc CHANGES.txt
index 39270e5,07742ef..8d07cbc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
   * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)
   * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bae4ca9/src/java/org/apache/cassandra/service/DataResolver.java
--
diff --cc src/java/org/apache/cassandra/service/DataResolver.java
index 4b0bd3c,9a98ee5..32fc015
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@@ -43,12 -43,10 +43,12 @@@ public class DataResolver extends Respo
  {
  @VisibleForTesting
  final List repairResults = 
Collections.synchronizedList(new ArrayList<>());
 +private final long queryStartNanoTime;
  
- public DataResolver(Keyspace keyspace, ReadCommand command, 
ConsistencyLevel consistency, int maxResponseCount, long queryStartNanoTime)
 -DataResolver(Keyspace keyspace, ReadCommand command, ConsistencyLevel 
consistency, int maxResponseCount)
++DataResolver(Keyspace keyspace, ReadCommand command, ConsistencyLevel 
consistency, int maxResponseCount, long queryStartNanoTime)
  {
  super(keyspace, command, consistency, maxResponseCount);
 +this.queryStartNanoTime = queryStartNanoTime;
  }
  
  public PartitionIterator getData()
@@@ -122,10 -123,23 +125,23 @@@
  if (!command.limits().isUnlimited())
  {
  for (int i = 0; i < results.size(); i++)
- results.set(i, Transformation.apply(results.get(i), new 
ShortReadProtection(sources[i], resultCounter, queryStartNanoTime)));
+ {
+ DataLimits.Counter singleResultCounter =
+ command.limits().newCounter(command.nowInSec(), false, 
command.selectsFullPartition()).onlyCount();
+ 
+ ShortReadResponseProtection protection =
 -new ShortReadResponseProtection(sources[i], 
singleResultCounter, mergedResultCounter);
++new ShortReadResponseProtection(sources[i], 
singleResultCounter, mergedResultCounter, queryStartNanoTime);
+ 
+ /*
+  * The order of transformations is important here. See 
ShortReadResponseProtection.applyToPartition()
+  * comments for details. We want 
singleResultCounter.applyToPartition() to be called after SRRP applies
+  * its

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

2017-09-19 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 594f1c1dfba44530e2b25f83a1e9d71f79aba7f6
Parents: 2556676 35e32f2
Author: Aleksey Yeschenko 
Authored: Tue Sep 19 11:18:20 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Sep 19 11:18:20 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/594f1c1d/CHANGES.txt
--
diff --cc CHANGES.txt
index 54117df,74e70e1..01955f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)
   * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
   * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
   * Fix counter application order in short read protection (CASSANDRA-12872)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/594f1c1d/src/java/org/apache/cassandra/service/DataResolver.java
--
diff --cc src/java/org/apache/cassandra/service/DataResolver.java
index 5708832,99399a3..4b0bd3c
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@@ -536,11 -522,15 +538,15 @@@ public class DataResolver extends Respo
  // Also note that we only get here once all the results for 
this node have been returned, and so
  // if the node had returned the requested number but we still 
get there, it imply some results were
  // skipped during reconciliation.
 -if (lastCount == counter.counted() || 
!counter.isDoneForPartition())
 +if (lastCount == counted(counter) || 
!counter.isDoneForPartition())
  return null;
- lastCount = counted(counter);
  
- assert !postReconciliationCounter.isDoneForPartition();
+ // clustering of the last row returned is empty, meaning that 
there is only one row per partition,
+ // and we already have it.
+ if (lastClustering == Clustering.EMPTY)
+ return null;
+ 
 -lastCount = counter.counted();
++lastCount = counted(counter);
  
  // We need to try to query enough additional results to 
fulfill our query, but because we could still
  // get short reads on that additional query, just querying 
the number of results we miss may not be


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-18 Thread marcuse

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2556676876e94a398b4dd3f46b3e77bd0d38f73d
Parents: f9e7c2b bb3b332
Author: Marcus Eriksson 
Authored: Mon Sep 18 08:55:21 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Sep 18 08:55:21 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25566768/CHANGES.txt
--
diff --cc CHANGES.txt
index e09708d,84ef845..54117df
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
   * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
   * Fix counter application order in short read protection (CASSANDRA-12872)
   * Don't block RepairJob execution on validation futures (CASSANDRA-13797)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-15 Thread jkni

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f9e7c2b691970f63481ce9f7c5e8b8ac48f4e597
Parents: 436761e d79fc9a
Author: Joel Knighton 
Authored: Fri Sep 15 16:22:03 2017 -0500
Committer: Joel Knighton 
Committed: Fri Sep 15 16:22:03 2017 -0500

--
 CHANGES.txt  | 1 +
 test/unit/org/apache/cassandra/db/CellTest.java  | 4 ++--
 test/unit/org/apache/cassandra/db/rows/RowsTest.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/CHANGES.txt
--
diff --cc CHANGES.txt
index f0c05bf,7afbfaa..e09708d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
   * Fix counter application order in short read protection (CASSANDRA-12872)
   * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
   * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/test/unit/org/apache/cassandra/db/CellTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CellTest.java
index d69617e,22f1b78..ea009f6
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@@ -351,18 -255,18 +351,18 @@@ public class CellTes
  {
  ColumnDefinition m = cfm2.getColumnDefinition(new 
ColumnIdentifier("m", false));
  int now1 = FBUtilities.nowInSeconds();
- long ts1 = now1*100;
+ long ts1 = now1*100L;
  
  
 -Cell r1m1 = BufferCell.live(cfm2, m, ts1, bb(1), 
CellPath.create(bb(1)));
 -Cell r1m2 = BufferCell.live(cfm2, m, ts1, bb(2), 
CellPath.create(bb(2)));
 +Cell r1m1 = BufferCell.live(m, ts1, bb(1), CellPath.create(bb(1)));
 +Cell r1m2 = BufferCell.live(m, ts1, bb(2), CellPath.create(bb(2)));
  List cells1 = Lists.newArrayList(r1m1, r1m2);
  
  int now2 = now1 + 1;
- long ts2 = now2*100;
+ long ts2 = now2*100L;
 -Cell r2m2 = BufferCell.live(cfm2, m, ts2, bb(1), 
CellPath.create(bb(2)));
 -Cell r2m3 = BufferCell.live(cfm2, m, ts2, bb(2), 
CellPath.create(bb(3)));
 -Cell r2m4 = BufferCell.live(cfm2, m, ts2, bb(3), 
CellPath.create(bb(4)));
 +Cell r2m2 = BufferCell.live(m, ts2, bb(1), CellPath.create(bb(2)));
 +Cell r2m3 = BufferCell.live(m, ts2, bb(2), CellPath.create(bb(3)));
 +Cell r2m4 = BufferCell.live(m, ts2, bb(3), CellPath.create(bb(4)));
  List cells2 = Lists.newArrayList(r2m2, r2m3, r2m4);
  
  RowBuilder builder = new RowBuilder();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/test/unit/org/apache/cassandra/db/rows/RowsTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-15 Thread aleksey

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2a93c22a3a315eceae951a86e612fbe8a0a85702
Parents: d9a2cc9 9ea6130
Author: Aleksey Yeschenko 
Authored: Fri Sep 15 17:25:40 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Fri Sep 15 17:25:40 2017 +0100

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/service/DataResolver.java| 14 ++
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a93c22a/CHANGES.txt
--
diff --cc CHANGES.txt
index eb1d154,a259545..33055e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Fix counter application order in short read protection (CASSANDRA-12872)
   * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
   * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
   * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a93c22a/src/java/org/apache/cassandra/service/DataResolver.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-13 Thread bdeggleston

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 28b75ba355b0d69ce09789a737df2546cd5c0954
Parents: cbc26d8 e7299c0
Author: Blake Eggleston 
Authored: Wed Sep 13 15:01:41 2017 -0700
Committer: Blake Eggleston 
Committed: Wed Sep 13 15:01:41 2017 -0700

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/repair/RepairJob.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28b75ba3/CHANGES.txt
--
diff --cc CHANGES.txt
index b3fb5a6,7ce298d..bc84477
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
   * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
   * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
   * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28b75ba3/src/java/org/apache/cassandra/repair/RepairJob.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-13 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: cbc26d81d53822d16eb83052a69426e4f61f77ef
Parents: 60a2d97 d826c81
Author: Jason Brown 
Authored: Wed Sep 13 06:29:42 2017 -0700
Committer: Jason Brown 
Committed: Wed Sep 13 06:30:33 2017 -0700

--
 CHANGES.txt |  1 +
 .../commitlog/CommitLogSegmentManagerTest.java  | 30 
 2 files changed, 31 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbc26d81/CHANGES.txt
--
diff --cc CHANGES.txt
index ec9d126,4d2d5e7..b3fb5a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
   * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
   * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
   * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbc26d81/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
index e22e86f,41f5ed5..dfbf5ad
--- 
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
+++ 
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
@@@ -20,9 -20,10 +20,11 @@@
   */
  package org.apache.cassandra.db.commitlog;
  
+ import java.io.File;
  import java.nio.ByteBuffer;
 +import java.util.ArrayList;
  import java.util.Random;
+ import java.util.UUID;
  import java.util.concurrent.Semaphore;
  
  import com.google.common.collect.ImmutableMap;
@@@ -139,4 -136,32 +141,32 @@@ public class CommitLogSegmentManagerTes
  Thread.currentThread().interrupt();
  }
  }
+ 
+ @Test
+ @BMRule(name = "Make removing commitlog segments slow",
+ targetClass = "CommitLogSegment",
+ targetMethod = "discard",
+ action = "Thread.sleep(50)")
+ public void testShutdownWithPendingTasks() throws Throwable {
+ CommitLog.instance.resetUnsafe(true);
+ ColumnFamilyStore cfs1 = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(STANDARD1);
+ 
+ final Mutation m = new RowUpdateBuilder(cfs1.metadata, 0, "k")
+.clustering("bytes")
+.add("val", ByteBuffer.wrap(entropy))
+.build();
+ 
+ // force creating several commitlog files
+ for (int i = 0; i < 10; i++) {
+ CommitLog.instance.add(m);
+ }
+ 
+ // schedule discarding completed segments and immediately issue a 
shutdown
+ UUID cfid = m.getColumnFamilyIds().iterator().next();
 -CommitLog.instance.discardCompletedSegments(cfid, 
ReplayPosition.NONE, CommitLog.instance.getContext());
++CommitLog.instance.discardCompletedSegments(cfid, 
CommitLogPosition.NONE, CommitLog.instance.getCurrentPosition());
+ CommitLog.instance.shutdownBlocking();
+ 
+ // the shutdown should block until all logs except the currently 
active one and perhaps a new, empty one are gone
 -Assert.assertTrue(new 
File(CommitLog.instance.location).listFiles().length <= 2);
++Assert.assertTrue(new 
File(DatabaseDescriptor.getCommitLogLocation()).listFiles().length <= 2);
+ }
  }

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

2017-09-13 Thread stefania

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 60a2d97a63c151c3f76791775d6ab09d97c74b54
Parents: cb2a1c8 9882cd8
Author: Stefania Alborghetti 
Authored: Wed Sep 13 16:46:49 2017 +0800
Committer: Stefania Alborghetti 
Committed: Wed Sep 13 16:46:49 2017 +0800

--
 .../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60a2d97a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ab0486d,6f37d8f..d83b96c
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -26,9 -26,9 +26,10 @@@ import java.util.*
  import com.google.common.collect.Lists;
  import org.junit.BeforeClass;
  import org.junit.Test;
+ import org.junit.Assume;
  
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.db.*;
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.dht.RandomPartitioner;


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-12 Thread jasobrown

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: cb2a1c8f4209ffe9aea8e40e7f0e45dc70613645
Parents: c05d98a a08a816
Author: Jason Brown 
Authored: Tue Sep 12 14:11:06 2017 -0700
Committer: Jason Brown 
Committed: Tue Sep 12 14:14:28 2017 -0700

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/cql3/Tuples.java  | 24 +++-
 .../cql3/validation/entities/TupleTypeTest.java | 14 
 3 files changed, 33 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb2a1c8f/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c48ab2,3d3903e..ec9d126
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
   * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
   * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
   * Range deletes in a CAS batch are ignored (CASSANDRA-13655)

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


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2017-09-12 Thread paulo

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: eb027a1de6d97f040ef9da1552e5811539e633a0
Parents: b64a4e4 1210365
Author: Paulo Motta 
Authored: Tue Sep 12 08:31:42 2017 -0500
Committer: Paulo Motta 
Committed: Tue Sep 12 08:33:00 2017 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/batchlog/BatchlogManager.java |  3 +-
 .../service/BatchlogResponseHandler.java|  4 +-
 .../apache/cassandra/service/StorageProxy.java  | 86 +---
 4 files changed, 44 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/CHANGES.txt
--
diff --cc CHANGES.txt
index 52775e7,26b1794..099a869
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,6 +1,17 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
   * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
   * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
   * Better handle corrupt final commitlog segment (CASSANDRA-11995)
   * StreamingHistogram is not thread safe (CASSANDRA-13756)

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index b8f87d9,1ce1bc5..913c3c2
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -819,7 -756,31 +792,34 @@@ public class StorageProxy implements St
  "but this node hasn't updated its 
ring metadata yet. Adding mutation to " +
  "local batchlog to be replayed 
later.",
  mutation.key());
- nonPairedMutations.add(mutation);
+ continue;
+ }
+ 
+ // When local node is the paired endpoint just apply the 
mutation locally.
+ if 
(pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) && 
StorageService.instance.isJoined())
++{
+ try
+ {
+ mutation.apply(writeCommitLog);
+ nonLocalMutations.remove(mutation);
+ cleanup.ackMutation();
+ }
+ catch (Exception exc)
+ {
+ logger.error("Error applying local view update to 
keyspace {}: {}", mutation.getKeyspaceName(), mutation);
+ throw exc;
+ }
++}
+ else
+ {
+ wrappers.add(wrapViewBatchResponseHandler(mutation,
+   
consistencyLevel,
+   
consistencyLevel,
+

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

2017-09-07 Thread stefania

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 260475d0f2b1f9a8344a3cfb38f6766c9241b52e
Parents: 5dcb354 ae88fd6
Author: Stefania Alborghetti 
Authored: Fri Sep 8 12:43:30 2017 +0800
Committer: Stefania Alborghetti 
Committed: Fri Sep 8 12:43:30 2017 +0800

--
 CHANGES.txt |   1 +
 .../io/sstable/IndexSummaryBuilder.java |  70 ---
 .../cassandra/io/sstable/IndexSummaryTest.java  | 123 +++
 3 files changed, 179 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/260475d0/CHANGES.txt
--
diff --cc CHANGES.txt
index 75d9bd6,f4360be..23e6c8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,4 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
++ * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
   * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
   * Better handle corrupt final commitlog segment (CASSANDRA-11995)
   * StreamingHistogram is not thread safe (CASSANDRA-13756)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/260475d0/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index f3757a0,ad08ba0..ab0486d
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -45,14 -44,126 +45,137 @@@ import static org.junit.Assert.*
  
  public class IndexSummaryTest
  {
+ private final static Random random = new Random();
 -private final static IPartitioner partitioner = Util.testPartitioner();
++
 +@BeforeClass
 +public static void initDD()
 +{
 +DatabaseDescriptor.daemonInitialization();
++
++final long seed = System.nanoTime();
++System.out.println("Using seed: " + seed);
++random.setSeed(seed);
 +}
 +
 +IPartitioner partitioner = Util.testPartitioner();
  
+ @BeforeClass
+ public static void setup()
+ {
+ final long seed = System.nanoTime();
+ System.out.println("Using seed: " + seed);
+ random.setSeed(seed);
+ }
+ 
+ @Test
+ public void testIndexSummaryKeySizes() throws IOException
+ {
+ testIndexSummaryProperties(32, 100);
+ testIndexSummaryProperties(64, 100);
+ testIndexSummaryProperties(100, 100);
+ testIndexSummaryProperties(1000, 100);
+ testIndexSummaryProperties(1, 100);
+ }
+ 
+ private void testIndexSummaryProperties(int keySize, int numKeys) throws 
IOException
+ {
+ final int minIndexInterval = 1;
+ final List keys = new ArrayList<>(numKeys);
+ 
+ try (IndexSummaryBuilder builder = new IndexSummaryBuilder(numKeys, 
minIndexInterval, BASE_SAMPLING_LEVEL))
+ {
+ for (int i = 0; i < numKeys; i++)
+ {
+ byte[] randomBytes = new byte[keySize];
+ random.nextBytes(randomBytes);
+ DecoratedKey key = 
partitioner.decorateKey(ByteBuffer.wrap(randomBytes));
+ keys.add(key);
+ builder.maybeAddEntry(key, i);
+ }
+ 
+ try(IndexSummary indexSummary = builder.build(partitioner))
+ {
+ assertEquals(numKeys, keys.size());
+ assertEquals(minIndexInterval, 
indexSummary.getMinIndexInterval());
+ assertEquals(numKeys, indexSummary.getMaxNumberOfEntries());
+ assertEquals(numKeys + 1, 
indexSummary.getEstimatedKeyCount());
+

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

2017-09-05 Thread jjirsa

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 90b39dc619d75096e897fb8e90dd38b04e67f848
Parents: 3f5f702 bc5c231
Author: Jeff Jirsa 
Authored: Tue Sep 5 11:58:31 2017 -0700
Committer: Jeff Jirsa 
Committed: Tue Sep 5 11:59:25 2017 -0700

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/utils/MerkleTree.java  | 23 +
 .../apache/cassandra/utils/MerkleTreeTest.java  | 34 
 3 files changed, 51 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b39dc6/CHANGES.txt
--
diff --cc CHANGES.txt
index 5a53e50,4302fdf..75d9bd6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
   * Better handle corrupt final commitlog segment (CASSANDRA-11995)
   * StreamingHistogram is not thread safe (CASSANDRA-13756)
   * Fix MV timestamp issues (CASSANDRA-11500)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b39dc6/src/java/org/apache/cassandra/utils/MerkleTree.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

1 2 >

1 - 100 of 197 matches

Mail list logo