from:"mck"

cassandra git commit: added forgotten CHANGES.txt entry for commit f0c94 | Tracing payload not passed through newSession(..) | patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-11706

2016-08-30 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 68d252663 -> 102541e12


added forgotten CHANGES.txt entry for commit f0c94
| Tracing payload not passed through newSession(..)
|  patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-11706


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

Branch: refs/heads/trunk
Commit: 102541e12a86746b36b2789417dc45c235a2db28
Parents: 68d2526
Author: mck <m...@semb.wever.org>
Authored: Tue Aug 30 16:05:10 2016 +1000
Committer: mck <m...@semb.wever.org>
Committed: Tue Aug 30 16:05:10 2016 +1000

--
 CHANGES.txt | 293 ---
 1 file changed, 147 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/102541e1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 67f7786..77d32be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.10
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
  * avoid deleting non existing sstable files and improve related log messages 
(CASSANDRA-12261)
  * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
  * Retry all internode messages once after a connection is
@@ -1021,7 +1022,7 @@ Merged from 2.1:
  * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
COMPACT STORAGE tables with no clustering columns
  * Eliminate strong self-reference chains in sstable ref tidiers 
(CASSANDRA-9656)
- * Ensure StreamSession uses canonical sstable reader instances 
(CASSANDRA-9700) 
+ * Ensure StreamSession uses canonical sstable reader instances 
(CASSANDRA-9700)
  * Ensure memtable book keeping is not corrupted in the event we shrink usage 
(CASSANDRA-9681)
  * Update internal python driver for cqlsh (CASSANDRA-9064)
  * Fix IndexOutOfBoundsException when inserting tuple with too many
@@ -1080,7 +1081,7 @@ Merged from 2.1:
error responses to unsupported protocol versions (CASSANDRA-9451)
  * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504)
  * Fix empty partition assertion in unsorted sstable writing tools 
(CASSANDRA-9071)
- * Ensure truncate without snapshot cannot produce corrupt responses 
(CASSANDRA-9388) 
+ * Ensure truncate without snapshot cannot produce corrupt responses 
(CASSANDRA-9388)
  * Consistent error message when a table mixes counter and non-counter
columns (CASSANDRA-9492)
  * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
@@ -1132,7 +1133,7 @@ Merged from 2.0:
  * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), fromJson()
functions (CASSANDRA-7970)
  * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
- * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
+ * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670)
  * New tool added to validate all sstables in a node (CASSANDRA-5791)
  * Push notification when tracing completes for an operation (CASSANDRA-7807)
  * Delay "node up" and "node added" notifications until native protocol server 
is started (CASSANDRA-8236)
@@ -1201,7 +1202,7 @@ Merged from 2.0:
  * Allow compilation in java 8 (CASSANDRA-7028)
  * Make incremental repair default (CASSANDRA-7250)
  * Enable code coverage thru JaCoCo (CASSANDRA-7226)
- * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
  * Shorten SSTable path (CASSANDRA-6962)
  * Use unsafe mutations for most unit tests (CASSANDRA-6969)
  * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
@@ -1336,7 +1337,7 @@ Merged from 2.0:
  * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
  * IndexSummaryBuilder utilises offheap memory, and shares data between
each IndexSummary opened from it (CASSANDRA-8757)
- * markCompacting only succeeds if the exact SSTableReader instances being 
+ * markCompacting only succeeds if the exact SSTableReader instances being
marked are in the live set (CASSANDRA-8689)
  * cassandra-stress support for varint (CASSANDRA-8882)
  * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
@@ -1458,7 +1459,7 @@ Merged from 2.0:
  * Invalidate affected prepared statements when a table's columns
are altered (CASSANDRA-7910)
  * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
- * Fix regression in SSTableRewriter causing some rows to become unreadable 
+

cassandra git commit: Automate Nodetool Documentation

2016-10-06 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 324bd7187 -> b9191871c


Automate Nodetool Documentation

patch by Andrew Baker ; reviewed by Jon Haddad for CASSANDRA-12672


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

Branch: refs/heads/trunk
Commit: b9191871c32d3ab06030548c9fa63e0cab43c6c7
Parents: 324bd71
Author: mck <m...@semb.wever.org>
Authored: Fri Oct 7 16:43:25 2016 +1100
Committer: mck <m...@semb.wever.org>
Committed: Fri Oct 7 16:52:18 2016 +1100

--
 .gitignore|  1 +
 CHANGES.txt   |  1 +
 doc/Makefile  | 28 
 doc/gen-nodetool-docs.py  | 69 ++
 doc/source/tools/index.rst|  2 +-
 doc/source/tools/nodetool.rst | 22 
 6 files changed, 100 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9191871/.gitignore
--
diff --git a/.gitignore b/.gitignore
index f5b1ce1..76c4bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@ lib/jsr223/scala/*.jar
 
 # Generated files from the documentation
 doc/source/configuration/cassandra_config_file.rst
+doc/source/tools/nodetool

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9191871/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b5d5bf4..2783b9f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
  * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
  * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9191871/doc/Makefile
--
diff --git a/doc/Makefile b/doc/Makefile
index 81d7707..88ceaaf 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,6 +19,8 @@ YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
 
 MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) 
$(YAML_DOC_OUTPUT)
 
+GENERATE_NODETOOL_DOCS = python gen-nodetool-docs.py
+
 WEB_SITE_PRESENCE_FILE='source/.build_for_website'
 
 .PHONY: help
@@ -60,6 +62,7 @@ clean:
 .PHONY: html
 html:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
@@ -68,6 +71,7 @@ html:
 website: clean
@touch $(WEB_SITE_PRESENCE_FILE)
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@rm $(WEB_SITE_PRESENCE_FILE)
@echo
@@ -76,6 +80,7 @@ website: clean
 .PHONY: dirhtml
 dirhtml:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
@@ -83,6 +88,7 @@ dirhtml:
 .PHONY: singlehtml
 singlehtml:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
@@ -90,6 +96,7 @@ singlehtml:
 .PHONY: pickle
 pickle:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
@@ -97,6 +104,7 @@ pickle:
 .PHONY: json
 json:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
@@ -104,6 +112,7 @@ json:
 .PHONY: htmlhelp
 htmlhelp:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
@@ -112,6 +121,7 @@ htmlhelp:
 .PHONY: qthelp
 qthelp:
$(MAKE_CASSANDRA_YAML)
+   $(GENERATE_NODETOOL_DOCS)
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" 
\
@@ -123,6 +133,7 @@ qthelp:

[1/3] cassandra git commit: CompressedRandomAccessReaderTest.testDataCorruptionDetection fails sporadically

2016-10-08 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 695065e27 -> e9ea5e0a2
  refs/heads/trunk a333a2f3b -> 253801323


CompressedRandomAccessReaderTest.testDataCorruptionDetection fails sporadically

Patch by Blake Eggleston; reviewed by Caleb Rackliffe for CASSANDRA-12552


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

Branch: refs/heads/cassandra-3.0
Commit: e9ea5e0a28b998e0c2f318309b66f0aea9561c38
Parents: 695065e
Author: mck <m...@apache.org>
Authored: Sat Oct 8 22:51:32 2016 +1100
Committer: mck <m...@apache.org>
Committed: Sat Oct 8 22:51:32 2016 +1100

--
 .../CompressedRandomAccessReaderTest.java   | 82 +---
 1 file changed, 38 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9ea5e0a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index 802d9c8..0c96327 100644
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.io.compress;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.Arrays;
 import java.util.Random;
 
 import org.junit.Test;
@@ -176,6 +177,9 @@ public class CompressedRandomAccessReaderTest
 }
 }
 
+/**
+ * If the data read out doesn't match the checksum, an exception should be 
thrown
+ */
 @Test
 public void testDataCorruptionDetection() throws IOException
 {
@@ -206,59 +210,49 @@ public class CompressedRandomAccessReaderTest
 try(RandomAccessReader reader = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
 {// read and verify compressed data
 assertEquals(CONTENT, reader.readLine());
+}
+
+Random random = new Random();
+try(RandomAccessFile checksumModifier = new RandomAccessFile(file, 
"rw"))
+{
+byte[] checksum = new byte[4];
 
-Random random = new Random();
-RandomAccessFile checksumModifier = null;
+// seek to the end of the compressed chunk
+checksumModifier.seek(chunk.length);
+// read checksum bytes
+checksumModifier.read(checksum);
 
-try
+byte[] corruptChecksum = new byte[4];
+do
 {
-checksumModifier = new RandomAccessFile(file, "rw");
-byte[] checksum = new byte[4];
-
-// seek to the end of the compressed chunk
-checksumModifier.seek(chunk.length);
-// read checksum bytes
-checksumModifier.read(checksum);
-// seek back to the chunk end
-checksumModifier.seek(chunk.length);
-
-// lets modify one byte of the checksum on each iteration
-for (int i = 0; i < checksum.length; i++)
-{
-checksumModifier.write(random.nextInt());
-SyncUtil.sync(checksumModifier); // making sure that 
change was synced with disk
-
-try (final RandomAccessReader r = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
-{
-Throwable exception = null;
-try
-{
-r.readLine();
-}
-catch (Throwable t)
-{
-exception = t;
-}
-assertNotNull(exception);
-assertSame(exception.getClass(), 
CorruptSSTableException.class);
-assertSame(exception.getCause().getClass(), 
CorruptBlockException.class);
-}
-}
+random.nextBytes(corruptChecksum);
+} while (Arrays.equals(corruptChecksum, checksum));
 
-// lets write original checksum and check if we can read 
data
-upda

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-10-08 Thread mck

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 253801323c51ae94b7f00ef80da1528cd79bff8a
Parents: a333a2f e9ea5e0
Author: mck <m...@apache.org>
Authored: Sat Oct 8 23:49:25 2016 +1100
Committer: mck <m...@apache.org>
Committed: Sun Oct 9 00:04:28 2016 +1100

--
 .../CompressedRandomAccessReaderTest.java   | 55 +---
 1 file changed, 24 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25380132/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index 3380e30,0c96327..0d2a9fb
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@@ -21,12 -21,10 +21,13 @@@ package org.apache.cassandra.io.compres
  import java.io.File;
  import java.io.IOException;
  import java.io.RandomAccessFile;
+ import java.util.Arrays;
  import java.util.Random;
  
 +import org.junit.BeforeClass;
  import org.junit.Test;
 +
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.db.ClusteringComparator;
  import org.apache.cassandra.db.marshal.BytesType;
  import org.apache.cassandra.exceptions.ConfigurationException;
@@@ -192,69 -201,60 +196,58 @@@ public class CompressedRandomAccessRead
  writer.finish();
  }
  
 -try(ChannelProxy channel = new ChannelProxy(file))
 -{
 -// open compression metadata and get chunk information
 -CompressionMetadata meta = new 
CompressionMetadata(metadata.getPath(), file.length(), ChecksumType.CRC32);
 -CompressionMetadata.Chunk chunk = meta.chunkFor(0);
 -
 -try(RandomAccessReader reader = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
 -{// read and verify compressed data
 -assertEquals(CONTENT, reader.readLine());
 -}
 +// open compression metadata and get chunk information
 +CompressionMetadata meta = new 
CompressionMetadata(metadata.getPath(), file.length(), ChecksumType.CRC32);
 +CompressionMetadata.Chunk chunk = meta.chunkFor(0);
  
 +try (FileHandle.Builder builder = new 
FileHandle.Builder(file.getPath()).withCompressionMetadata(meta);
 + FileHandle fh = builder.complete();
 + RandomAccessReader reader = fh.createReader())
 +{// read and verify compressed data
 +assertEquals(CONTENT, reader.readLine());
- 
  Random random = new Random();
- RandomAccessFile checksumModifier = null;
- 
- try
+ try(RandomAccessFile checksumModifier = new 
RandomAccessFile(file, "rw"))
  {
- checksumModifier = new RandomAccessFile(file, "rw");
  byte[] checksum = new byte[4];
  
  // seek to the end of the compressed chunk
  checksumModifier.seek(chunk.length);
  // read checksum bytes
  checksumModifier.read(checksum);
- // seek back to the chunk end
- checksumModifier.seek(chunk.length);
  
- // lets modify one byte of the checksum on each iteration
- for (int i = 0; i < checksum.length; i++)
+ byte[] corruptChecksum = new byte[4];
+ do
  {
- checksumModifier.write(random.nextInt());
- SyncUtil.sync(checksumModifier); // making sure that 
change was synced with disk
+ random.nextBytes(corruptChecksum);
+ } while (Arrays.equals(corruptChecksum, checksum));
  
- try (final RandomAccessReader r = fh.createReader())
+ updateChecksum(checksumModifier, chunk.length, 
corruptChecksum);
+ 
 -try (final RandomAccessReader r = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
++try (final RandomAccessReader r = fh.createReader())
+ {
+ Throwable exception = null;
+ try
  {
- Throwable exception = null;
- try
- {
- r.readLine();
-

[2/3] cassandra git commit: CompressedRandomAccessReaderTest.testDataCorruptionDetection fails sporadically

2016-10-08 Thread mck

CompressedRandomAccessReaderTest.testDataCorruptionDetection fails sporadically

Patch by Blake Eggleston; reviewed by Caleb Rackliffe for CASSANDRA-12552


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

Branch: refs/heads/trunk
Commit: e9ea5e0a28b998e0c2f318309b66f0aea9561c38
Parents: 695065e
Author: mck <m...@apache.org>
Authored: Sat Oct 8 22:51:32 2016 +1100
Committer: mck <m...@apache.org>
Committed: Sat Oct 8 22:51:32 2016 +1100

--
 .../CompressedRandomAccessReaderTest.java   | 82 +---
 1 file changed, 38 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9ea5e0a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index 802d9c8..0c96327 100644
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.io.compress;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.Arrays;
 import java.util.Random;
 
 import org.junit.Test;
@@ -176,6 +177,9 @@ public class CompressedRandomAccessReaderTest
 }
 }
 
+/**
+ * If the data read out doesn't match the checksum, an exception should be 
thrown
+ */
 @Test
 public void testDataCorruptionDetection() throws IOException
 {
@@ -206,59 +210,49 @@ public class CompressedRandomAccessReaderTest
 try(RandomAccessReader reader = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
 {// read and verify compressed data
 assertEquals(CONTENT, reader.readLine());
+}
+
+Random random = new Random();
+try(RandomAccessFile checksumModifier = new RandomAccessFile(file, 
"rw"))
+{
+byte[] checksum = new byte[4];
 
-Random random = new Random();
-RandomAccessFile checksumModifier = null;
+// seek to the end of the compressed chunk
+checksumModifier.seek(chunk.length);
+// read checksum bytes
+checksumModifier.read(checksum);
 
-try
+byte[] corruptChecksum = new byte[4];
+do
 {
-checksumModifier = new RandomAccessFile(file, "rw");
-byte[] checksum = new byte[4];
-
-// seek to the end of the compressed chunk
-checksumModifier.seek(chunk.length);
-// read checksum bytes
-checksumModifier.read(checksum);
-// seek back to the chunk end
-checksumModifier.seek(chunk.length);
-
-// lets modify one byte of the checksum on each iteration
-for (int i = 0; i < checksum.length; i++)
-{
-checksumModifier.write(random.nextInt());
-SyncUtil.sync(checksumModifier); // making sure that 
change was synced with disk
-
-try (final RandomAccessReader r = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
-{
-Throwable exception = null;
-try
-{
-r.readLine();
-}
-catch (Throwable t)
-{
-exception = t;
-}
-assertNotNull(exception);
-assertSame(exception.getClass(), 
CorruptSSTableException.class);
-assertSame(exception.getCause().getClass(), 
CorruptBlockException.class);
-}
-}
+random.nextBytes(corruptChecksum);
+} while (Arrays.equals(corruptChecksum, checksum));
 
-// lets write original checksum and check if we can read 
data
-updateChecksum(checksumModifier, chunk.length, checksum);
+updateChecksum(checksumModifier, chunk.length, 
corruptChecksum);
 
-

cassandra git commit: Tracing payload not passed through newSession(..)

2016-08-29 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk af4ebfffc -> f0c94a43f


Tracing payload not passed through newSession(..)

 patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-11706


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

Branch: refs/heads/trunk
Commit: f0c94a43f23d338cbbb3a4420e9f296484a10dc1
Parents: af4ebff
Author: mck <m...@semb.wever.org>
Authored: Mon Aug 29 22:15:50 2016 +1000
Committer: mck <m...@semb.wever.org>
Committed: Mon Aug 29 22:15:50 2016 +1000

--
 .../org/apache/cassandra/tracing/Tracing.java   | 10 --
 .../apache/cassandra/tracing/TracingTest.java   | 34 
 2 files changed, 41 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0c94a43/src/java/org/apache/cassandra/tracing/Tracing.java
--
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java 
b/src/java/org/apache/cassandra/tracing/Tracing.java
index adf5ed9..c6fe46b 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -104,7 +104,7 @@ public abstract class Tracing implements 
ExecutorLocal
 catch (Exception e)
 {
 JVMStabilityInspector.inspectThrowable(e);
-logger.error("Cannot use class {} for tracing ({}), ignoring 
by defaulting on normal tracing", customTracingClass, e.getMessage());
+logger.error(String.format("Cannot use class %s for tracing, 
ignoring by defaulting to normal tracing", customTracingClass), e);
 }
 }
 instance = null != tracing ? tracing : new TracingImpl();
@@ -138,7 +138,10 @@ public abstract class Tracing implements 
ExecutorLocal
 
 public UUID newSession(Map<String,ByteBuffer> customPayload)
 {
-return newSession(TraceType.QUERY);
+return newSession(
+
TimeUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes())),
+TraceType.QUERY,
+customPayload);
 }
 
 public UUID newSession(TraceType traceType)
@@ -151,9 +154,10 @@ public abstract class Tracing implements 
ExecutorLocal
 
 public UUID newSession(UUID sessionId, Map<String,ByteBuffer> 
customPayload)
 {
-return newSession(sessionId, TraceType.QUERY, Collections.EMPTY_MAP);
+return newSession(sessionId, TraceType.QUERY, customPayload);
 }
 
+/** This method is intended to be overridden in tracing implementations 
that need access to the customPayload */
 protected UUID newSession(UUID sessionId, TraceType traceType, 
Map<String,ByteBuffer> customPayload)
 {
 assert get() == null;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0c94a43/test/unit/org/apache/cassandra/tracing/TracingTest.java
--
diff --git a/test/unit/org/apache/cassandra/tracing/TracingTest.java 
b/test/unit/org/apache/cassandra/tracing/TracingTest.java
index ab6d03d..a5ad610 100644
--- a/test/unit/org/apache/cassandra/tracing/TracingTest.java
+++ b/test/unit/org/apache/cassandra/tracing/TracingTest.java
@@ -22,6 +22,7 @@ import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -102,6 +103,32 @@ public final class TracingTest
 }
 
 @Test
+public void test_customPayload()
+{
+List traces = new ArrayList<>();
+ByteBuffer customPayloadValue = 
ByteBuffer.wrap("test-value".getBytes());
+
+Map<String,ByteBuffer> customPayload = 
Collections.singletonMap("test-key", customPayloadValue);
+
+TracingImpl tracing = new TracingImpl(traces);
+tracing.newSession(customPayload);
+TraceState state = tracing.begin("test-custom_payload", 
Collections.<String,String>emptyMap());
+state.trace("test-1");
+state.trace("test-2");
+state.trace("test-3");
+tracing.stopSession();
+
+assert null == tracing.get();
+assert 4 == traces.size();
+assert "test-custom_payload".equals(traces.get(0));
+assert "test-1".equals(traces.get(1));
+assert "test-2".equals(traces.get(2));
+assert "test-3".equals(traces.get(3));
+ass

cassandra git commit: Correct Spelling Errors in IEndPointSnitch JavaDocs

2016-11-07 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 459946aee -> 138f7b5d0


Correct Spelling Errors in IEndPointSnitch JavaDocs

Patch by Christopher Licata ; reviewed by Mick Semb Wever for CASSANDRA-12855
This closes #79


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

Branch: refs/heads/trunk
Commit: 138f7b5d005c9554e9c87a7fa03df23c32d551a4
Parents: 459946a
Author: Mick Semb Wever 
Authored: Tue Nov 8 12:32:03 2016 +1100
Committer: Mick Semb Wever 
Committed: Tue Nov 8 12:32:03 2016 +1100

--
 src/java/org/apache/cassandra/locator/IEndpointSnitch.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/138f7b5d/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/IEndpointSnitch.java 
b/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
index 690b84f..71b441c 100644
--- a/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
@@ -22,15 +22,15 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This interface helps determine location of node in the data center relative 
to another node.
+ * This interface helps determine location of node in the datacenter relative 
to another node.
  * Give a node A and another node B it can tell if A and B are on the same 
rack or in the same
- * data center.
+ * datacenter.
  */
 
 public interface IEndpointSnitch
 {
 /**
- * returns a String repesenting the rack this endpoint belongs to
+ * returns a String representing the rack this endpoint belongs to
  */
 public String getRack(InetAddress endpoint);

[1/2] cassandra git commit: Fix cqlsh automatic protocol downgrade regression Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307

2017-04-19 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk e52420624 -> 08c216d12


Fix cqlsh automatic protocol downgrade regression
Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307


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

Branch: refs/heads/trunk
Commit: 9c54d02f73245d3a9a05d37f7d0002421abb852f
Parents: 65c1fdd
Author: Matt Byrd 
Authored: Wed Mar 8 13:55:01 2017 -0800
Committer: Mick Semb Wever 
Committed: Wed Apr 19 16:15:37 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c54d02f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 19d8162..1757266 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@
  * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
  * Address message coalescing regression (CASSANDRA-12676)
  * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 Merged from 3.0:
  * Handling partially written hint files (CASSANDRA-12728)
  * Fix NPE issue in StorageService (CASSANDRA-13060)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c54d02f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 2387342..e765dee 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -178,7 +178,6 @@ from cqlshlib.util import get_file_encoding_bomsize, 
trim_if_present
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042
 DEFAULT_SSL = False
-DEFAULT_PROTOCOL_VERSION = 4
 DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
 DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
 
@@ -223,6 +222,9 @@ parser.add_option('--cqlversion', default=None,
   help='Specify a particular CQL version, '
'by default the highest version supported by the server 
will be used.'
' Examples: "3.0.3", "3.1.0"')
+parser.add_option("--protocol-version", type="int", default=None,
+  help='Specify a specific protcol version otherwise the 
client will default and downgrade as necessary')
+
 parser.add_option("-e", "--execute", help='Execute the statement and quit.')
 parser.add_option("--connect-timeout", 
default=DEFAULT_CONNECT_TIMEOUT_SECONDS, dest='connect_timeout',
   help='Specify the connection timeout in seconds (default: 
%default seconds).')
@@ -449,7 +451,7 @@ class Shell(cmd.Cmd):
  ssl=False,
  single_statement=None,
  request_timeout=DEFAULT_REQUEST_TIMEOUT_SECONDS,
- protocol_version=DEFAULT_PROTOCOL_VERSION,
+ protocol_version=None,
  connect_timeout=DEFAULT_CONNECT_TIMEOUT_SECONDS):
 cmd.Cmd.__init__(self, completekey=completekey)
 self.hostname = hostname
@@ -468,13 +470,16 @@ class Shell(cmd.Cmd):
 if use_conn:
 self.conn = use_conn
 else:
+kwargs = {}
+if protocol_version is not None:
+kwargs['protocol_version'] = protocol_version
 self.conn = Cluster(contact_points=(self.hostname,), 
port=self.port, cql_version=cqlver,
-protocol_version=protocol_version,
 auth_provider=self.auth_provider,
 ssl_options=sslhandling.ssl_settings(hostname, 
CONFIG_FILE) if ssl else None,
 
load_balancing_policy=WhiteListRoundRobinPolicy([self.hostname]),
 control_connection_timeout=connect_timeout,
-connect_timeout=connect_timeout)
+connect_timeout=connect_timeout,
+**kwargs)
 self.owns_connection = not use_conn
 
 if keyspace:
@@ -1673,9 +1678,9 @@ class Shell(cmd.Cmd):
 
 direction = parsed.get_binding('dir').upper()
 if direction == 'FROM':
-task = ImportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ImportTask(self, ks, table, columns, fname, opts, 
self.conn.protocol_version, CONFIG_FILE)
 elif direction == 'TO':
-task = ExportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ExportTask(self, ks, table, columns,

[2/2] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-04-19 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 08c216d125e5c8ed33a3403cde185f4e84d31895
Parents: e524206 9c54d02
Author: Mick Semb Wever 
Authored: Thu Apr 20 00:44:52 2017 +1000
Committer: Mick Semb Wever 
Committed: Thu Apr 20 00:44:52 2017 +1000

--

--

cassandra git commit: Fix cqlsh automatic protocol downgrade regression Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307

2017-04-19 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 65c1fddbc -> 9c54d02f7


Fix cqlsh automatic protocol downgrade regression
Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307


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

Branch: refs/heads/cassandra-3.11
Commit: 9c54d02f73245d3a9a05d37f7d0002421abb852f
Parents: 65c1fdd
Author: Matt Byrd 
Authored: Wed Mar 8 13:55:01 2017 -0800
Committer: Mick Semb Wever 
Committed: Wed Apr 19 16:15:37 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c54d02f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 19d8162..1757266 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@
  * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
  * Address message coalescing regression (CASSANDRA-12676)
  * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 Merged from 3.0:
  * Handling partially written hint files (CASSANDRA-12728)
  * Fix NPE issue in StorageService (CASSANDRA-13060)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c54d02f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 2387342..e765dee 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -178,7 +178,6 @@ from cqlshlib.util import get_file_encoding_bomsize, 
trim_if_present
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042
 DEFAULT_SSL = False
-DEFAULT_PROTOCOL_VERSION = 4
 DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
 DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
 
@@ -223,6 +222,9 @@ parser.add_option('--cqlversion', default=None,
   help='Specify a particular CQL version, '
'by default the highest version supported by the server 
will be used.'
' Examples: "3.0.3", "3.1.0"')
+parser.add_option("--protocol-version", type="int", default=None,
+  help='Specify a specific protcol version otherwise the 
client will default and downgrade as necessary')
+
 parser.add_option("-e", "--execute", help='Execute the statement and quit.')
 parser.add_option("--connect-timeout", 
default=DEFAULT_CONNECT_TIMEOUT_SECONDS, dest='connect_timeout',
   help='Specify the connection timeout in seconds (default: 
%default seconds).')
@@ -449,7 +451,7 @@ class Shell(cmd.Cmd):
  ssl=False,
  single_statement=None,
  request_timeout=DEFAULT_REQUEST_TIMEOUT_SECONDS,
- protocol_version=DEFAULT_PROTOCOL_VERSION,
+ protocol_version=None,
  connect_timeout=DEFAULT_CONNECT_TIMEOUT_SECONDS):
 cmd.Cmd.__init__(self, completekey=completekey)
 self.hostname = hostname
@@ -468,13 +470,16 @@ class Shell(cmd.Cmd):
 if use_conn:
 self.conn = use_conn
 else:
+kwargs = {}
+if protocol_version is not None:
+kwargs['protocol_version'] = protocol_version
 self.conn = Cluster(contact_points=(self.hostname,), 
port=self.port, cql_version=cqlver,
-protocol_version=protocol_version,
 auth_provider=self.auth_provider,
 ssl_options=sslhandling.ssl_settings(hostname, 
CONFIG_FILE) if ssl else None,
 
load_balancing_policy=WhiteListRoundRobinPolicy([self.hostname]),
 control_connection_timeout=connect_timeout,
-connect_timeout=connect_timeout)
+connect_timeout=connect_timeout,
+**kwargs)
 self.owns_connection = not use_conn
 
 if keyspace:
@@ -1673,9 +1678,9 @@ class Shell(cmd.Cmd):
 
 direction = parsed.get_binding('dir').upper()
 if direction == 'FROM':
-task = ImportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ImportTask(self, ks, table, columns, fname, opts, 
self.conn.protocol_version, CONFIG_FILE)
 elif direction == 'TO':
-task = ExportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ExportTask(self, ks,

[1/3] cassandra git commit: Tracing payload not passed from QueryMessage to tracing session Patch by Mick Semb Wever; Reviewed by T Jake Luciani for CASSANDRA-12835

2017-04-22 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 ba9beea9d -> 44eb797ad
  refs/heads/trunk 049ba2d4d -> 87169c82f


Tracing payload not passed from QueryMessage to tracing session
Patch by Mick Semb Wever; Reviewed by T Jake Luciani for CASSANDRA-12835


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

Branch: refs/heads/cassandra-3.11
Commit: 44eb797ad7028fe7b4fcd49800162db7c5c87cdc
Parents: ba9beea
Author: Mick Semb Wever 
Authored: Tue Oct 25 20:00:46 2016 +1100
Committer: Mick Semb Wever 
Committed: Sun Apr 23 12:14:25 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/QueryState.java|  6 -
 .../cassandra/thrift/CassandraServer.java   |  2 +-
 .../transport/messages/BatchMessage.java|  2 +-
 .../transport/messages/PrepareMessage.java  |  2 +-
 .../transport/messages/QueryMessage.java|  2 +-
 .../apache/cassandra/tracing/TracingTest.java   | 25 +++-
 7 files changed, 19 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 08df2dd..2ae052e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@
  * Address message coalescing regression (CASSANDRA-12676)
  * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
  * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 Merged from 3.0:
  * Fail repair if insufficient responses received (CASSANDRA-13397)
  * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/service/QueryState.java
--
diff --git a/src/java/org/apache/cassandra/service/QueryState.java 
b/src/java/org/apache/cassandra/service/QueryState.java
index c70c692..f0ae3b2 100644
--- a/src/java/org/apache/cassandra/service/QueryState.java
+++ b/src/java/org/apache/cassandra/service/QueryState.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.service;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
@@ -77,11 +76,6 @@ public class QueryState
 this.preparedTracingSession = sessionId;
 }
 
-public void createTracingSession()
-{
-createTracingSession(Collections.EMPTY_MAP);
-}
-
 public void createTracingSession(Map customPayload)
 {
 UUID session = this.preparedTracingSession;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 351d463..04a3e66 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -2525,7 +2525,7 @@ public class CassandraServer implements Cassandra.Iface
 {
 if (state().getQueryState().traceNextQuery())
 {
-state().getQueryState().createTracingSession();
+
state().getQueryState().createTracingSession(Collections.EMPTY_MAP);
 return true;
 }
 return false;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
--
diff --git a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java 
b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
index bb6411f..0be027f 100644
--- a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
@@ -160,7 +160,7 @@ public class BatchMessage extends Message.Request
 
 if (state.traceNextQuery())
 {
-state.createTracingSession();
+state.createTracingSession(getCustomPayload());
 
 ImmutableMap.Builder builder = 
ImmutableMap.builder();
 if(options.getConsistency() != null)

[2/3] cassandra git commit: Tracing payload not passed from QueryMessage to tracing session Patch by Mick Semb Wever; Reviewed by T Jake Luciani for CASSANDRA-12835

2017-04-22 Thread mck

Tracing payload not passed from QueryMessage to tracing session
Patch by Mick Semb Wever; Reviewed by T Jake Luciani for CASSANDRA-12835


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

Branch: refs/heads/trunk
Commit: 44eb797ad7028fe7b4fcd49800162db7c5c87cdc
Parents: ba9beea
Author: Mick Semb Wever 
Authored: Tue Oct 25 20:00:46 2016 +1100
Committer: Mick Semb Wever 
Committed: Sun Apr 23 12:14:25 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/QueryState.java|  6 -
 .../cassandra/thrift/CassandraServer.java   |  2 +-
 .../transport/messages/BatchMessage.java|  2 +-
 .../transport/messages/PrepareMessage.java  |  2 +-
 .../transport/messages/QueryMessage.java|  2 +-
 .../apache/cassandra/tracing/TracingTest.java   | 25 +++-
 7 files changed, 19 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 08df2dd..2ae052e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@
  * Address message coalescing regression (CASSANDRA-12676)
  * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
  * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 Merged from 3.0:
  * Fail repair if insufficient responses received (CASSANDRA-13397)
  * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/service/QueryState.java
--
diff --git a/src/java/org/apache/cassandra/service/QueryState.java 
b/src/java/org/apache/cassandra/service/QueryState.java
index c70c692..f0ae3b2 100644
--- a/src/java/org/apache/cassandra/service/QueryState.java
+++ b/src/java/org/apache/cassandra/service/QueryState.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.service;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
@@ -77,11 +76,6 @@ public class QueryState
 this.preparedTracingSession = sessionId;
 }
 
-public void createTracingSession()
-{
-createTracingSession(Collections.EMPTY_MAP);
-}
-
 public void createTracingSession(Map customPayload)
 {
 UUID session = this.preparedTracingSession;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 351d463..04a3e66 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -2525,7 +2525,7 @@ public class CassandraServer implements Cassandra.Iface
 {
 if (state().getQueryState().traceNextQuery())
 {
-state().getQueryState().createTracingSession();
+
state().getQueryState().createTracingSession(Collections.EMPTY_MAP);
 return true;
 }
 return false;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
--
diff --git a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java 
b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
index bb6411f..0be027f 100644
--- a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
@@ -160,7 +160,7 @@ public class BatchMessage extends Message.Request
 
 if (state.traceNextQuery())
 {
-state.createTracingSession();
+state.createTracingSession(getCustomPayload());
 
 ImmutableMap.Builder builder = 
ImmutableMap.builder();
 if(options.getConsistency() != null)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44eb797a/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-04-22 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 87169c82f34a72fe3e7d20c96f710b72b0b86a4e
Parents: 049ba2d 44eb797
Author: Mick Semb Wever 
Authored: Sun Apr 23 12:18:54 2017 +1000
Committer: Mick Semb Wever 
Committed: Sun Apr 23 12:24:28 2017 +1000

--
 CHANGES.txt |  2 ++
 .../apache/cassandra/service/QueryState.java|  6 -
 .../transport/messages/BatchMessage.java|  2 +-
 .../transport/messages/PrepareMessage.java  |  2 +-
 .../transport/messages/QueryMessage.java|  2 +-
 .../apache/cassandra/tracing/TracingTest.java   | 25 +++-
 6 files changed, 19 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87169c82/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87169c82/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java
--

cassandra git commit: Fix cqlsh automatic protocol downgrade regression Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307

2017-04-18 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 74bdf633e -> 8f5f54fb1


Fix cqlsh automatic protocol downgrade regression
Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307


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

Branch: refs/heads/trunk
Commit: 8f5f54fb1c6b32e1dceacb4e694c414d3583a419
Parents: 74bdf63
Author: Matt Byrd <matthew_b...@apple.com>
Authored: Wed Mar 8 13:55:01 2017 -0800
Committer: mck <m...@thelastpickle.com>
Committed: Tue Apr 18 17:12:50 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5f54fb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index dae275f..adbaf84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,7 @@
  * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
  * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 
 
 3.11.0

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5f54fb/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index bd62072..28e8043 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -178,7 +178,6 @@ from cqlshlib.util import get_file_encoding_bomsize, 
trim_if_present
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042
 DEFAULT_SSL = False
-DEFAULT_PROTOCOL_VERSION = 4
 DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
 DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
 
@@ -223,6 +222,9 @@ parser.add_option('--cqlversion', default=None,
   help='Specify a particular CQL version, '
'by default the highest version supported by the server 
will be used.'
' Examples: "3.0.3", "3.1.0"')
+parser.add_option("--protocol-version", type="int", default=None,
+  help='Specify a specific protcol version otherwise the 
client will default and downgrade as necessary')
+
 parser.add_option("-e", "--execute", help='Execute the statement and quit.')
 parser.add_option("--connect-timeout", 
default=DEFAULT_CONNECT_TIMEOUT_SECONDS, dest='connect_timeout',
   help='Specify the connection timeout in seconds (default: 
%default seconds).')
@@ -449,7 +451,7 @@ class Shell(cmd.Cmd):
  ssl=False,
  single_statement=None,
  request_timeout=DEFAULT_REQUEST_TIMEOUT_SECONDS,
- protocol_version=DEFAULT_PROTOCOL_VERSION,
+ protocol_version=None,
  connect_timeout=DEFAULT_CONNECT_TIMEOUT_SECONDS):
 cmd.Cmd.__init__(self, completekey=completekey)
 self.hostname = hostname
@@ -468,13 +470,16 @@ class Shell(cmd.Cmd):
 if use_conn:
 self.conn = use_conn
 else:
+kwargs = {}
+if protocol_version is not None:
+kwargs['protocol_version'] = protocol_version
 self.conn = Cluster(contact_points=(self.hostname,), 
port=self.port, cql_version=cqlver,
-protocol_version=protocol_version,
 auth_provider=self.auth_provider,
 ssl_options=sslhandling.ssl_settings(hostname, 
CONFIG_FILE) if ssl else None,
 
load_balancing_policy=WhiteListRoundRobinPolicy([self.hostname]),
 control_connection_timeout=connect_timeout,
-connect_timeout=connect_timeout)
+connect_timeout=connect_timeout,
+**kwargs)
 self.owns_connection = not use_conn
 
 if keyspace:
@@ -1673,9 +1678,9 @@ class Shell(cmd.Cmd):
 
 direction = parsed.get_binding('dir').upper()
 if direction == 'FROM':
-task = ImportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ImportTask(self, ks, table, columns, fname, opts, 
self.conn.protocol_version, CONFIG_FILE)
 elif direction == 'TO':
-task = ExportTask(self, ks, table, columns, fname, opts, 
DEFAULT_PROTOCOL_VERSION, CONFIG_FILE)
+task = ExportTask(self, ks, table, columns, fname, opts, 
self.conn.protocol_version, CONFIG_F

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-08-15 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 22b2a82f76417f8cc2d7a16bfd41b05ff624e880
Parents: 256a74f 2795d72
Author: mck <m...@thelastpickle.com>
Authored: Wed Aug 16 13:03:28 2017 +1000
Committer: mck <m...@thelastpickle.com>
Committed: Wed Aug 16 13:05:50 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22b2a82f/CHANGES.txt
--
diff --cc CHANGES.txt
index ee5b955,4ede932..2961a1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,5 +1,121 @@@
 +4.0
 + * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664)
 + * Use an ExecutorService for repair commands instead of new 
Thread(..).start() (CASSANDRA-13594)
 + * Fix race / ref leak in anticompaction (CASSANDRA-13688)
 + * Expose tasks queue length via JMX (CASSANDRA-12758)
 + * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751)
 + * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615)
 + * Improve sstablemetadata output (CASSANDRA-11483)
 + * Support for migrating legacy users to roles has been dropped 
(CASSANDRA-13371)
 + * Introduce error metrics for repair (CASSANDRA-13387)
 + * Refactoring to primitive functional interfaces in AuthCache 
(CASSANDRA-13732)
 + * Update metrics to 3.1.5 (CASSANDRA-13648)
 + * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)
 + * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725)
 + * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727)
 + * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996)
 + * Default for start_native_transport now true if not set in config 
(CASSANDRA-13656)
 + * Don't add localhost to the graph when calculating where to stream from 
(CASSANDRA-13583)
 + * Allow skipping equality-restricted clustering columns in ORDER BY clause 
(CASSANDRA-10271)
 + * Use common nowInSec for validation compactions (CASSANDRA-13671)
 + * Improve handling of IR prepare failures (CASSANDRA-13672)
 + * Send IR coordinator messages synchronously (CASSANDRA-13673)
 + * Flush system.repair table before IR finalize promise (CASSANDRA-13660)
 + * Fix column filter creation for wildcard queries (CASSANDRA-13650)
 + * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool 
setbatchlogreplaythrottle' (CASSANDRA-13614)
 + * fix race condition in PendingRepairManager (CASSANDRA-13659)
 + * Allow noop incremental repair state transitions (CASSANDRA-13658)
 + * Run repair with down replicas (CASSANDRA-10446)
 + * Added started & completed repair metrics (CASSANDRA-13598)
 + * Added started & completed repair metrics (CASSANDRA-13598)
 + * Improve secondary index (re)build failure and concurrency handling 
(CASSANDRA-10130)
 + * Improve calculation of available disk space for compaction 
(CASSANDRA-13068)
 + * Change the accessibility of RowCacheSerializer for third party row cache 
plugins (CASSANDRA-13579)
 + * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
 + * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
 + * Fix Randomness of stress values (CASSANDRA-12744)
 + * Allow selecting Map values and Set elements (CASSANDRA-7396)
 + * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
 + * Update repairTime for keyspaces on completion (CASSANDRA-13539)
 + * Add configurable upper bound for validation executor threads 
(CASSANDRA-13521)
 + * Bring back maxHintTTL propery (CASSANDRA-12982)
 + * Add testing guidelines (CASSANDRA-13497)
 + * Add more repair metrics (CASSANDRA-13531)
 + * RangeStreamer should be smarter when picking endpoints for streaming 
(CASSANDRA-4650)
 + * Avoid rewrapping an exception thrown for cache load functions 
(CASSANDRA-13367)
 + * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
 + * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
 + * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
 + * Fix WriteResponseHandlerTest is sensitive to test execution order 
(CASSANDRA-13421)
 + * Improve incremental repair logging (CASSANDRA-13468)
 + * Start compaction when incremental repair finishes (CASSANDRA-13454)
 + * Add repair streaming preview (CASSANDRA-13257)
 + * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
 + * Change protocol to allow sending k

[1/3] cassandra git commit: Better bootstrap failure message when blocked by (potential) range movement

2017-08-15 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 db57cbddc -> 2795d72b4
  refs/heads/trunk 256a74faa -> 22b2a82f7


Better bootstrap failure message when blocked by (potential) range movement

 patch by Mick Semb Wever; reviewed by Jeff Jirsa  for CASSANDRA-13744


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

Branch: refs/heads/cassandra-3.11
Commit: 2795d72b46e493b87f74a4eb9c25520adff58f8c
Parents: db57cbd
Author: Mick Semb Wever <m...@apache.org>
Authored: Fri Aug 4 23:44:26 2017 +1000
Committer: mck <m...@thelastpickle.com>
Committed: Wed Aug 16 12:41:21 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5403812..4ede932 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.1
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 29619c4..cbf69b4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -899,7 +899,10 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 tokenMetadata.getMovingEndpoints().size() > 0
 ))
 {
-throw new UnsupportedOperationException("Other 
bootstrapping/leaving/moving nodes detected, cannot bootstrap while 
cassandra.consistent.rangemovement is true");
+String bootstrapTokens = 
StringUtils.join(tokenMetadata.getBootstrapTokens().valueSet(), ',');
+String leavingTokens = 
StringUtils.join(tokenMetadata.getLeavingEndpoints(), ',');
+String movingTokens = 
StringUtils.join(tokenMetadata.getMovingEndpoints().stream().map(e -> 
e.right).toArray(), ',');
+throw new UnsupportedOperationException(String.format("Other 
bootstrapping/leaving/moving nodes detected, cannot bootstrap while 
cassandra.consistent.rangemovement is true. Nodes detected, bootstrapping: %s; 
leaving: %s; moving: %s;", bootstrapTokens, leavingTokens, movingTokens));
 }
 
 // get bootstrap tokens


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

[2/3] cassandra git commit: Better bootstrap failure message when blocked by (potential) range movement

2017-08-15 Thread mck

Better bootstrap failure message when blocked by (potential) range movement

 patch by Mick Semb Wever; reviewed by Jeff Jirsa  for CASSANDRA-13744


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

Branch: refs/heads/trunk
Commit: 2795d72b46e493b87f74a4eb9c25520adff58f8c
Parents: db57cbd
Author: Mick Semb Wever <m...@apache.org>
Authored: Fri Aug 4 23:44:26 2017 +1000
Committer: mck <m...@thelastpickle.com>
Committed: Wed Aug 16 12:41:21 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5403812..4ede932 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.1
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 29619c4..cbf69b4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -899,7 +899,10 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 tokenMetadata.getMovingEndpoints().size() > 0
 ))
 {
-throw new UnsupportedOperationException("Other 
bootstrapping/leaving/moving nodes detected, cannot bootstrap while 
cassandra.consistent.rangemovement is true");
+String bootstrapTokens = 
StringUtils.join(tokenMetadata.getBootstrapTokens().valueSet(), ',');
+String leavingTokens = 
StringUtils.join(tokenMetadata.getLeavingEndpoints(), ',');
+String movingTokens = 
StringUtils.join(tokenMetadata.getMovingEndpoints().stream().map(e -> 
e.right).toArray(), ',');
+throw new UnsupportedOperationException(String.format("Other 
bootstrapping/leaving/moving nodes detected, cannot bootstrap while 
cassandra.consistent.rangemovement is true. Nodes detected, bootstrapping: %s; 
leaving: %s; moving: %s;", bootstrapTokens, leavingTokens, movingTokens));
 }
 
 // get bootstrap tokens


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

cassandra git commit: Changing `max_hint_window_in_ms` at runtime

2017-05-09 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 2304363e4 -> 981e3b3c7


Changing `max_hint_window_in_ms` at runtime

 patch by Hiroyuki Nishi; reviewed by Mick Semb Wever for CASSANDRA-11720


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

Branch: refs/heads/trunk
Commit: 981e3b3c76b7cd6ed1ef318e4cd7ddfb2910be31
Parents: 2304363
Author: Mick Semb Wever 
Authored: Wed May 3 06:37:11 2017 +1000
Committer: Mick Semb Wever 
Committed: Wed May 10 13:08:41 2017 +1000

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/NodeProbe.java   | 10 ++
 .../org/apache/cassandra/tools/NodeTool.java|  2 ++
 .../tools/nodetool/GetMaxHintWindow.java| 33 +
 .../tools/nodetool/SetMaxHintWindow.java| 37 
 5 files changed, 83 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/981e3b3c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 93096fe..7f72f30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -60,6 +60,7 @@
  * Add support for arithmetic operators (CASSANDRA-11935)
  * Add histogram for delay to deliver hints (CASSANDRA-13234)
  * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
 
 
 3.11.0

http://git-wip-us.apache.org/repos/asf/cassandra/blob/981e3b3c/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 865665c..8a1ab74 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -1011,6 +1011,16 @@ public class NodeProbe implements AutoCloseable
 return ssProxy.getConcurrentCompactors();
 }
 
+public void setMaxHintWindow(int value)
+{
+spProxy.setMaxHintWindow(value);
+}
+
+public int getMaxHintWindow()
+{
+return spProxy.getMaxHintWindow();
+}
+
 public long getTimeout(String type)
 {
 switch (type)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/981e3b3c/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java 
b/src/java/org/apache/cassandra/tools/NodeTool.java
index 20f7f17..22c6b09 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -85,6 +85,7 @@ public class NodeTool
 GetInterDCStreamThroughput.class,
 GetEndpoints.class,
 GetSSTables.class,
+GetMaxHintWindow.class,
 GossipInfo.class,
 InvalidateKeyCache.class,
 InvalidateRowCache.class,
@@ -111,6 +112,7 @@ public class NodeTool
 SetStreamThroughput.class,
 SetInterDCStreamThroughput.class,
 SetTraceProbability.class,
+SetMaxHintWindow.class,
 Snapshot.class,
 ListSnapshots.class,
 Status.class,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/981e3b3c/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java
--
diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java 
b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java
new file mode 100644
index 000..280d70c
--- /dev/null
+++ b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java
@@ -0,0 +1,33 @@
+/*
+ * 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

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2017-06-12 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
--
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
 -2.2.10
 +3.0.14
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
+  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow roun

[02/10] cassandra git commit: Node running with join_ring=false and authentication can not serve requests

2017-06-12 Thread mck

Node running with join_ring=false and authentication can not serve requests

 patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381


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

Branch: refs/heads/cassandra-3.0
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <m...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <m...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java 
b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.exceptions.*;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.mindrot.jbcrypt.BCrypt;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
  */
 private static void setupDefaultRole()
 {
+if 
(StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+throw new IllegalStateException("CassandraRoleManager skipped 
default role setup: no known tokens in ring");
+
 try
 {
 if (!hasExistingRoles())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final StreamStateStore streamStateStore = new StreamStateStore();
 
+private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
 /** This method updates the local token on disk  */
 public void setTokens(Collection tokens)
 {
@@ -657,6 +659,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 states.add(Pair.create(ApplicationState.STATUS, 
valueFactory.hibernate(true)));
 Gossiper.instance.addLocalApplicationStates(states);
 }
+doAuthSetup();
 logger.info("Not joining ring as requested. Use JMX 
(StorageService->joinRing()) to initiate ring joining");
 }
 }
@@ -974,12 +977,15 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private void doAuthSetup()
 {
-maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+if (!doneAuthSetup.getAndSet(true))
+{
+maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
 
-DatabaseDescriptor.getRoleManager().setup();
-DatabaseDescriptor.getAuthenticator().setup();
-DatabaseDescriptor.getAuthorizer().setup();
-MigrationManager.instance.register(new AuthMigrationListener());
+Databa

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/trunk
Commit: 6220108e687e28b05d7cb0bbd254751f51a0f1d7
Parents: 30412b0 7b9868c
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:11:15 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:15:03 2017 +1000

--
 CHANGES.txt|  1 +
 .../cassandra/auth/CassandraRoleManager.java   |  4 
 .../apache/cassandra/service/StorageService.java   | 17 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/CHANGES.txt
--
diff --cc CHANGES.txt
index 2ffa526,26462db..f285ff0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,34 -40,12 +74,35 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
++ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
 + * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 749c6a9,3bad040..b4878c7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -190,12 -177,10 +190,13 @@@ public class StorageService extends Not
  private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
  /* true if node is rebuilding and receiving data */
  private final AtomicBoolean isRebuilding = new AtomicBoolean();
 +private final AtomicBoolean isDecommissioning = new

[04/10] cassandra git commit: Node running with join_ring=false and authentication can not serve requests

2017-06-12 Thread mck

Node running with join_ring=false and authentication can not serve requests

 patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381


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

Branch: refs/heads/trunk
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <m...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <m...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java 
b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.exceptions.*;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.mindrot.jbcrypt.BCrypt;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
  */
 private static void setupDefaultRole()
 {
+if 
(StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+throw new IllegalStateException("CassandraRoleManager skipped 
default role setup: no known tokens in ring");
+
 try
 {
 if (!hasExistingRoles())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final StreamStateStore streamStateStore = new StreamStateStore();
 
+private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
 /** This method updates the local token on disk  */
 public void setTokens(Collection tokens)
 {
@@ -657,6 +659,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 states.add(Pair.create(ApplicationState.STATUS, 
valueFactory.hibernate(true)));
 Gossiper.instance.addLocalApplicationStates(states);
 }
+doAuthSetup();
 logger.info("Not joining ring as requested. Use JMX 
(StorageService->joinRing()) to initiate ring joining");
 }
 }
@@ -974,12 +977,15 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private void doAuthSetup()
 {
-maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+if (!doneAuthSetup.getAndSet(true))
+{
+maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
 
-DatabaseDescriptor.getRoleManager().setup();
-DatabaseDescriptor.getAuthenticator().setup();
-DatabaseDescriptor.getAuthorizer().setup();
-MigrationManager.instance.register(new AuthMigrationListener());
+DatabaseDescriptor.getRoleManager().setup();
+

[01/10] cassandra git commit: Node running with join_ring=false and authentication can not serve requests

2017-06-12 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 5807eca8b -> f49579df3
  refs/heads/cassandra-3.0 40ad3cf4d -> 7b9868ce2
  refs/heads/cassandra-3.11 30412b08c -> 6220108e6
  refs/heads/trunk 3e8f3c5ed -> afd68abe6


Node running with join_ring=false and authentication can not serve requests

 patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381


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

Branch: refs/heads/cassandra-2.2
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <m...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <m...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java 
b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.exceptions.*;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.mindrot.jbcrypt.BCrypt;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
  */
 private static void setupDefaultRole()
 {
+if 
(StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+throw new IllegalStateException("CassandraRoleManager skipped 
default role setup: no known tokens in ring");
+
 try
 {
 if (!hasExistingRoles())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final StreamStateStore streamStateStore = new StreamStateStore();
 
+private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
 /** This method updates the local token on disk  */
 public void setTokens(Collection tokens)
 {
@@ -657,6 +659,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 states.add(Pair.create(ApplicationState.STATUS, 
valueFactory.hibernate(true)));
 Gossiper.instance.addLocalApplicationStates(states);
 }
+doAuthSetup();
 logger.info("Not joining ring as requested. Use JMX 
(StorageService->joinRing()) to initiate ring joining");
 }
 }
@@ -974,12 +977,15 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private void doAuthSetup()
 {
-maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+if (!doneAuthSetup.getAndSet(true))
+{
+maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
 
-DatabaseDescriptor.getRoleManager().setup(

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/cassandra-3.11
Commit: 6220108e687e28b05d7cb0bbd254751f51a0f1d7
Parents: 30412b0 7b9868c
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:11:15 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:15:03 2017 +1000

--
 CHANGES.txt|  1 +
 .../cassandra/auth/CassandraRoleManager.java   |  4 
 .../apache/cassandra/service/StorageService.java   | 17 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/CHANGES.txt
--
diff --cc CHANGES.txt
index 2ffa526,26462db..f285ff0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,34 -40,12 +74,35 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
++ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
 + * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 749c6a9,3bad040..b4878c7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -190,12 -177,10 +190,13 @@@ public class StorageService extends Not
  private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
  /* true if node is rebuilding and receiving data */
  private final AtomicBoolean isRebuilding = new AtomicBoolean();
 +private final AtomicBoolean isDecommissioni

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-06-12 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: afd68abe60742c6deb6357ba4605268dfb3d06ea
Parents: 3e8f3c5 6220108
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:15:57 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:19:58 2017 +1000

--
 CHANGES.txt|  1 +
 .../cassandra/auth/CassandraRoleManager.java   |  4 
 .../apache/cassandra/service/StorageService.java   | 17 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 0591760,777ed05..433290e
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -39,7 -39,9 +39,8 @@@ import org.apache.cassandra.cql3.statem
  import org.apache.cassandra.db.ConsistencyLevel;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.exceptions.*;
 -import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.QueryState;
+ import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.transport.messages.ResultMessage;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.mindrot.jbcrypt.BCrypt;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 8914440,b4878c7..a7d4e9d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1032,13 -1083,16 +1034,16 @@@ public class StorageService extends Not
  
  private void doAuthSetup()
  {
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+ if (!authSetupCalled.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
  
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- Schema.instance.registerListener(new AuthSchemaChangeListener());
- authSetupComplete = true;
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
 -MigrationManager.instance.register(new AuthMigrationListener());
++Schema.instance.registerListener(new AuthSchemaChangeListener());
+ authSetupComplete = true;
+ }
  }
  
  public boolean isAuthSetupComplete()


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

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2017-06-12 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
--
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
 -2.2.10
 +3.0.14
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
+  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight

[03/10] cassandra git commit: Node running with join_ring=false and authentication can not serve requests

2017-06-12 Thread mck

Node running with join_ring=false and authentication can not serve requests

 patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381


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

Branch: refs/heads/cassandra-3.11
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <m...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <m...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java 
b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.exceptions.*;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.mindrot.jbcrypt.BCrypt;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
  */
 private static void setupDefaultRole()
 {
+if 
(StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+throw new IllegalStateException("CassandraRoleManager skipped 
default role setup: no known tokens in ring");
+
 try
 {
 if (!hasExistingRoles())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final StreamStateStore streamStateStore = new StreamStateStore();
 
+private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
 /** This method updates the local token on disk  */
 public void setTokens(Collection tokens)
 {
@@ -657,6 +659,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 states.add(Pair.create(ApplicationState.STATUS, 
valueFactory.hibernate(true)));
 Gossiper.instance.addLocalApplicationStates(states);
 }
+doAuthSetup();
 logger.info("Not joining ring as requested. Use JMX 
(StorageService->joinRing()) to initiate ring joining");
 }
 }
@@ -974,12 +977,15 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private void doAuthSetup()
 {
-maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+if (!doneAuthSetup.getAndSet(true))
+{
+maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
 
-DatabaseDescriptor.getRoleManager().setup();
-DatabaseDescriptor.getAuthenticator().setup();
-DatabaseDescriptor.getAuthorizer().setup();
-MigrationManager.instance.register(new AuthMigrationListener());
+Databa

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2017-06-12 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <m...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <m...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
--
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
 -2.2.10
 +3.0.14
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
+  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight

[2/3] cassandra git commit: CASSANDRA-13418 Allow to skip overlapings checks

2017-09-04 Thread mck

CASSANDRA-13418 Allow to skip overlapings checks

 patch by Romain GÃRARD; reviewed by Mick Semb Wever for CASSANDRA-13418


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

Branch: refs/heads/trunk
Commit: 14d67d81c57d6387c77bd85c57b342d285880835
Parents: 37d6730
Author: Romain GÃRARD 
Authored: Wed Aug 16 16:21:46 2017 +0200
Committer: Mick Semb Wever 
Committed: Tue Sep 5 08:33:25 2017 +1000

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionController.java | 67 --
 .../TimeWindowCompactionController.java | 49 +
 .../TimeWindowCompactionStrategy.java   | 10 +--
 .../TimeWindowCompactionStrategyOptions.java| 22 ++
 .../db/compaction/TimeWindowCompactionTask.java | 42 +++
 .../db/compaction/CompactionControllerTest.java |  5 ++
 .../TimeWindowCompactionStrategyTest.java   | 74 +++-
 8 files changed, 257 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14d67d81/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1f63ced..9218d90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14d67d81/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/CompactionController.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index bf3647a..84aac09 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
 import java.util.*;
 import java.util.function.Predicate;
 
+import org.apache.cassandra.config.Config;
 import org.apache.cassandra.db.Memtable;
 import org.apache.cassandra.db.rows.UnfilteredRowIterator;
 
@@ -49,7 +50,8 @@ import static 
org.apache.cassandra.db.lifecycle.SSTableIntervalTree.buildInterva
 public class CompactionController implements AutoCloseable
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CompactionController.class);
-static final boolean NEVER_PURGE_TOMBSTONES = 
Boolean.getBoolean("cassandra.never_purge_tombstones");
+private static final String NEVER_PURGE_TOMBSTONES_PROPERTY = 
Config.PROPERTY_PREFIX + "never_purge_tombstones";
+static final boolean NEVER_PURGE_TOMBSTONES = 
Boolean.getBoolean(NEVER_PURGE_TOMBSTONES_PROPERTY);
 
 public final ColumnFamilyStore cfs;
 private final boolean compactingRepaired;
@@ -98,7 +100,14 @@ public class CompactionController implements AutoCloseable
 {
 if (NEVER_PURGE_TOMBSTONES)
 {
-logger.debug("not refreshing overlaps - running with 
-Dcassandra.never_purge_tombstones=true");
+logger.debug("not refreshing overlaps - running with -D{}=true",
+NEVER_PURGE_TOMBSTONES_PROPERTY);
+return;
+}
+
+if (ignoreOverlaps())
+{
+logger.debug("not refreshing overlaps - running with 
ignoreOverlaps activated");
 return;
 }
 
@@ -120,7 +129,7 @@ public class CompactionController implements AutoCloseable
 if (this.overlappingSSTables != null)
 close();
 
-if (compacting == null)
+if (compacting == null || ignoreOverlaps())
 overlappingSSTables = 
Refs.tryRef(Collections.emptyList());
 else
 overlappingSSTables = 
cfs.getAndReferenceOverlappingLiveSSTables(compacting);
@@ -129,7 +138,7 @@ public class CompactionController implements AutoCloseable
 
 public Set getFullyExpiredSSTables()
 {
-return getFullyExpiredSSTables(cfs, compacting, overlappingSSTables, 
gcBefore);
+return getFullyExpiredSSTables(cfs, compacting, overlappingSSTables, 
gcBefore, ignoreOverlaps());
 }
 
 /**
@@ -146,20 +155,39 @@ public class CompactionController implements AutoCloseable
  * @param compacting we take the drop-candidates from this set, it is

[1/3] cassandra git commit: CASSANDRA-13418 Allow to skip overlapings checks

2017-09-04 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 37d67306a -> 14d67d81c
  refs/heads/trunk c8d15f04f -> 10d5b7b2f


CASSANDRA-13418 Allow to skip overlapings checks

 patch by Romain GÃRARD; reviewed by Mick Semb Wever for CASSANDRA-13418


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

Branch: refs/heads/cassandra-3.11
Commit: 14d67d81c57d6387c77bd85c57b342d285880835
Parents: 37d6730
Author: Romain GÃRARD 
Authored: Wed Aug 16 16:21:46 2017 +0200
Committer: Mick Semb Wever 
Committed: Tue Sep 5 08:33:25 2017 +1000

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionController.java | 67 --
 .../TimeWindowCompactionController.java | 49 +
 .../TimeWindowCompactionStrategy.java   | 10 +--
 .../TimeWindowCompactionStrategyOptions.java| 22 ++
 .../db/compaction/TimeWindowCompactionTask.java | 42 +++
 .../db/compaction/CompactionControllerTest.java |  5 ++
 .../TimeWindowCompactionStrategyTest.java   | 74 +++-
 8 files changed, 257 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14d67d81/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1f63ced..9218d90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14d67d81/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/CompactionController.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index bf3647a..84aac09 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
 import java.util.*;
 import java.util.function.Predicate;
 
+import org.apache.cassandra.config.Config;
 import org.apache.cassandra.db.Memtable;
 import org.apache.cassandra.db.rows.UnfilteredRowIterator;
 
@@ -49,7 +50,8 @@ import static 
org.apache.cassandra.db.lifecycle.SSTableIntervalTree.buildInterva
 public class CompactionController implements AutoCloseable
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CompactionController.class);
-static final boolean NEVER_PURGE_TOMBSTONES = 
Boolean.getBoolean("cassandra.never_purge_tombstones");
+private static final String NEVER_PURGE_TOMBSTONES_PROPERTY = 
Config.PROPERTY_PREFIX + "never_purge_tombstones";
+static final boolean NEVER_PURGE_TOMBSTONES = 
Boolean.getBoolean(NEVER_PURGE_TOMBSTONES_PROPERTY);
 
 public final ColumnFamilyStore cfs;
 private final boolean compactingRepaired;
@@ -98,7 +100,14 @@ public class CompactionController implements AutoCloseable
 {
 if (NEVER_PURGE_TOMBSTONES)
 {
-logger.debug("not refreshing overlaps - running with 
-Dcassandra.never_purge_tombstones=true");
+logger.debug("not refreshing overlaps - running with -D{}=true",
+NEVER_PURGE_TOMBSTONES_PROPERTY);
+return;
+}
+
+if (ignoreOverlaps())
+{
+logger.debug("not refreshing overlaps - running with 
ignoreOverlaps activated");
 return;
 }
 
@@ -120,7 +129,7 @@ public class CompactionController implements AutoCloseable
 if (this.overlappingSSTables != null)
 close();
 
-if (compacting == null)
+if (compacting == null || ignoreOverlaps())
 overlappingSSTables = 
Refs.tryRef(Collections.emptyList());
 else
 overlappingSSTables = 
cfs.getAndReferenceOverlappingLiveSSTables(compacting);
@@ -129,7 +138,7 @@ public class CompactionController implements AutoCloseable
 
 public Set getFullyExpiredSSTables()
 {
-return getFullyExpiredSSTables(cfs, compacting, overlappingSSTables, 
gcBefore);
+return getFullyExpiredSSTables(cfs, compacting, overlappingSSTables, 
gcBefore, ignoreOverlaps());
 }
 
 /**
@@ -146,20

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-09-04 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 10d5b7b2f77fb7c25e288f42f7fb64b3131fad35
Parents: c8d15f0 14d67d8
Author: Mick Semb Wever 
Authored: Tue Sep 5 08:36:12 2017 +1000
Committer: Mick Semb Wever 
Committed: Tue Sep 5 08:38:48 2017 +1000

--
 doc/cql3/CQL.textile| 36 +-
 doc/source/operating/compaction.rst |  8 ++-
 .../db/compaction/CompactionController.java | 67 --
 .../TimeWindowCompactionController.java | 49 +
 .../TimeWindowCompactionStrategy.java   | 10 +--
 .../TimeWindowCompactionStrategyOptions.java| 22 ++
 .../db/compaction/TimeWindowCompactionTask.java | 42 +++
 .../db/compaction/CompactionControllerTest.java |  5 ++
 .../TimeWindowCompactionStrategyTest.java   | 74 +++-
 9 files changed, 281 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10d5b7b2/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index 88d6694,f2f9bd8..db1ec22
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -347,24 -347,24 +347,24 @@@ h4(#compactionOptions). Compaction opti
  
  The @compaction@ property must at least define the @'class'@ sub-option, that 
defines the compaction strategy class to use. The default supported class are 
@'SizeTieredCompactionStrategy'@, @'LeveledCompactionStrategy'@, 
@'DateTieredCompactionStrategy'@ and @'TimeWindowCompactionStrategy'@. Custom 
strategy can be provided by specifying the full class name as a "string 
constant":#constants. The rest of the sub-options depends on the chosen class. 
The sub-options supported by the default classes are:
  
--|_. option |_. supported compaction strategy |_. 
default|_. description |
--| @enabled@| _all_   | true   
  | A boolean denoting whether compaction should be enabled or not.|
--| @tombstone_threshold@| _all_   | 0.2
  | A ratio such that if a sstable has more than this ratio of gcable 
tombstones over all contained columns, the sstable will be compacted (with no 
other sstables) for the purpose of purging those tombstones. |
--| @tombstone_compaction_interval@  | _all_   | 1 day  
  | The minimum time to wait after an sstable creation time before 
considering it for "tombstone compaction", where "tombstone compaction" is the 
compaction triggered if the sstable has more gcable tombstones than 
@tombstone_threshold@. |
--| @unchecked_tombstone_compaction@ | _all_   | false  
  | Setting this to true enables more aggressive tombstone compactions - 
single sstable tombstone compactions will run without checking how likely it is 
that they will be successful. |
--| @min_sstable_size@   | SizeTieredCompactionStrategy| 50MB   
  | The size tiered strategy groups SSTables to compact in buckets. A 
bucket groups SSTables that differs from less than 50% in size.  However, for 
small sizes, this would result in a bucketing that is too fine grained. 
@min_sstable_size@ defines a size threshold (in bytes) below which all SSTables 
belong to one unique bucket|
--| @min_threshold@  | SizeTieredCompactionStrategy| 4  
  | Minimum number of SSTables needed to start a minor compaction.|
--| @max_threshold@  | SizeTieredCompactionStrategy| 32 
  | Maximum number of SSTables processed by one minor compaction.|
--| @bucket_low@ | SizeTieredCompactionStrategy| 0.5
  | Size tiered consider sstables to be within the same bucket if their 
size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] 
(i.e the default groups sstable whose sizes diverges by at most 50%)|
--| @bucket_high@| SizeTieredCompactionStrategy| 1.5
  | Size tiered consider sstables to be within the same bucket if their 
size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] 
(i.e the default groups sstable whose sizes diverges by at most 50%).|
--| @sstable_size_in_mb@ | LeveledCompactionStrategy   | 5MB
  | The target size (in MB) for sstables in the leveled strategy. Note that 
while sstable sizes should stay less or equal to @sstable_size_in_mb@, it is 
possible to exceptionally have a larger

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

2018-05-03 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 78ca3447c9735682119b01bdf98f06bb75f413ff
Parents: 645d827 bc30a6f
Author: Mick Semb Wever 
Authored: Fri May 4 15:08:21 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 4 15:14:04 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78ca3447/CHANGES.txt
--
diff --cc CHANGES.txt
index f0afbe6,5f66b62..628d0af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -246,8 -10,11 +246,9 @@@
   * 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
 -   (CASSANDRA-13910)
   * Add missed CQL keywords to documentation (CASSANDRA-14359)
   * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
   * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78ca3447/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78ca3447/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index d3235bc,93bb4c9..ccdfeb4
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -32,20 -32,43 +32,43 @@@ public final class CompactionInfo imple
  private final OperationType tasktype;
  private final long completed;
  private final long total;
- private final String unit;
+ private final Unit unit;
  private final UUID compactionId;
  
 +public CompactionInfo(TableMetadata metadata, OperationType tasktype, 
long bytesComplete, long totalBytes, UUID compactionId)
 +{
- this(metadata, tasktype, bytesComplete, totalBytes, "bytes", 
compactionId);
++this(metadata, tasktype, bytesComplete, totalBytes, Unit.BYTES, 
compactionId);
 +}
 +
- public CompactionInfo(OperationType tasktype, long completed, long total, 
String unit, UUID compactionId)
+ public static enum Unit
+ {
 -BYTES("bytes"), RANGES("ranges"), KEYS("keys");
++BYTES("bytes"), RANGES("token range parts"), KEYS("keys");
+ 
+ private final String name;
+ 
+ private Unit(String name)
+ {
+ this.name = name;
+ }
+ 
+ @Override
+ public String toString()
+ {
 -return name;
++return this.name;
+ }
+ 
+ public static boolean isFileSize(String unit)
+ {
+ return BYTES.toString().equals(unit);
+ }
+ }
+ 
 -public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
bytesComplete, long totalBytes, UUID compactionId)
 -{
 -this(cfm, tasktype, bytesComplete, totalBytes, Unit.BYTES, 
compactionId);
 -}
 -
+ public CompactionInfo(OperationType tasktype, long completed, long total, 
Unit unit, UUID compactionId)
  {
  this(null, tasktype, completed, total, unit, compactionId);
  }
  
- public CompactionInfo(TableMetadata metadata, OperationType tasktype, 
long completed, long total, String unit, UUID compactionId)
 -public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
completed, long total, Unit unit, UUID compactionId)
++public CompactionInfo(TableMetadata metadata, OperationType tasktype, 
long completed, long total, Unit unit, UUID compactionId)
  {

[1/6] cassandra git commit: fix viewbuilder progress and display in compactionstats

2018-05-03 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 15c463cb0 -> 9d498dced
  refs/heads/cassandra-3.11 dd9ae1d3e -> bc30a6f73
  refs/heads/trunk 645d8278b -> 78ca3447c


fix viewbuilder progress and display in compactionstats

patch by Zhao Yang (jasonstack); reviewed by Mick Semb Wever for CASSANDRA-12244


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

Branch: refs/heads/cassandra-3.0
Commit: 9d498dced6cea77b027b8a74bf4ae9201c8afdf5
Parents: 15c463c
Author: Mick Semb Wever 
Authored: Wed May 2 14:21:40 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 4 14:46:25 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/9d498dce/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e549cda..f1dcf52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/9d498dce/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java 
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index e39dcf1..00431b9 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.db.SystemKeyspace;
 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;
@@ -304,7 +305,7 @@ public class AutoSavingCache extends 
InstrumentingCachehttp://git-wip-us.apache.org/repos/asf/cassandra/blob/9d498dce/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 3cd8737..404c07f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -34,20 +34,43 @@ public final class CompactionInfo implements Serializable
 private final OperationType tasktype;
 private final long completed;
 private final long total;
-private final String unit;
+private final Unit unit;
 private final UUID compactionId;
 
+public static enum Unit
+{
+BYTES("bytes"), RANGES("ranges"), KEYS("keys");
+
+private final String name;
+
+private Unit(String name)
+{
+this.name = name;
+}
+
+@Override
+public String toString()
+{
+return name;
+}
+
+public static boolean isFileSize(String unit)
+{
+return BYTES.toString().equals(unit);
+}
+}
+
 public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
bytesComplete, long totalBytes, UUID compactionId)
 {
-this(cfm, tasktype, bytesComplete, totalBytes, "bytes", compactionId);
+this(cfm, tasktype, bytesComplete, totalBytes, Unit.BYTES, 
compactionId);
 }
 
-public CompactionInfo(OperationType tasktype, long completed, long total, 
String unit, UUID compactionId)
+public CompactionInfo(OperationType tasktype, long completed, long total, 
Unit unit, UUID compactionId)
 {
 this(null, tasktype, completed, total, unit, compactionId);
 }
 
-public

[3/6] cassandra git commit: fix viewbuilder progress and display in compactionstats

2018-05-03 Thread mck

fix viewbuilder progress and display in compactionstats

patch by Zhao Yang (jasonstack); reviewed by Mick Semb Wever for CASSANDRA-12244


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

Branch: refs/heads/trunk
Commit: 9d498dced6cea77b027b8a74bf4ae9201c8afdf5
Parents: 15c463c
Author: Mick Semb Wever 
Authored: Wed May 2 14:21:40 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 4 14:46:25 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/9d498dce/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e549cda..f1dcf52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/9d498dce/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java 
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index e39dcf1..00431b9 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.db.SystemKeyspace;
 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;
@@ -304,7 +305,7 @@ public class AutoSavingCache extends 
InstrumentingCachehttp://git-wip-us.apache.org/repos/asf/cassandra/blob/9d498dce/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 3cd8737..404c07f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -34,20 +34,43 @@ public final class CompactionInfo implements Serializable
 private final OperationType tasktype;
 private final long completed;
 private final long total;
-private final String unit;
+private final Unit unit;
 private final UUID compactionId;
 
+public static enum Unit
+{
+BYTES("bytes"), RANGES("ranges"), KEYS("keys");
+
+private final String name;
+
+private Unit(String name)
+{
+this.name = name;
+}
+
+@Override
+public String toString()
+{
+return name;
+}
+
+public static boolean isFileSize(String unit)
+{
+return BYTES.toString().equals(unit);
+}
+}
+
 public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
bytesComplete, long totalBytes, UUID compactionId)
 {
-this(cfm, tasktype, bytesComplete, totalBytes, "bytes", compactionId);
+this(cfm, tasktype, bytesComplete, totalBytes, Unit.BYTES, 
compactionId);
 }
 
-public CompactionInfo(OperationType tasktype, long completed, long total, 
String unit, UUID compactionId)
+public CompactionInfo(OperationType tasktype, long completed, long total, 
Unit unit, UUID compactionId)
 {
 this(null, tasktype, completed, total, unit, compactionId);
 }
 
-public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
completed, long total, String unit, UUID compactionId)
+public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
completed, long total, Unit

[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,
 +

[2/6] cassandra git commit: fix viewbuilder progress and display in compactionstats

2018-05-03 Thread mck

fix viewbuilder progress and display in compactionstats

patch by Zhao Yang (jasonstack); reviewed by Mick Semb Wever for CASSANDRA-12244


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

Branch: refs/heads/cassandra-3.11
Commit: 9d498dced6cea77b027b8a74bf4ae9201c8afdf5
Parents: 15c463c
Author: Mick Semb Wever 
Authored: Wed May 2 14:21:40 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 4 14:46:25 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/9d498dce/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e549cda..f1dcf52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/9d498dce/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java 
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index e39dcf1..00431b9 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.db.SystemKeyspace;
 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;
@@ -304,7 +305,7 @@ public class AutoSavingCache extends 
InstrumentingCachehttp://git-wip-us.apache.org/repos/asf/cassandra/blob/9d498dce/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 3cd8737..404c07f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -34,20 +34,43 @@ public final class CompactionInfo implements Serializable
 private final OperationType tasktype;
 private final long completed;
 private final long total;
-private final String unit;
+private final Unit unit;
 private final UUID compactionId;
 
+public static enum Unit
+{
+BYTES("bytes"), RANGES("ranges"), KEYS("keys");
+
+private final String name;
+
+private Unit(String name)
+{
+this.name = name;
+}
+
+@Override
+public String toString()
+{
+return name;
+}
+
+public static boolean isFileSize(String unit)
+{
+return BYTES.toString().equals(unit);
+}
+}
+
 public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
bytesComplete, long totalBytes, UUID compactionId)
 {
-this(cfm, tasktype, bytesComplete, totalBytes, "bytes", compactionId);
+this(cfm, tasktype, bytesComplete, totalBytes, Unit.BYTES, 
compactionId);
 }
 
-public CompactionInfo(OperationType tasktype, long completed, long total, 
String unit, UUID compactionId)
+public CompactionInfo(OperationType tasktype, long completed, long total, 
Unit unit, UUID compactionId)
 {
 this(null, tasktype, completed, total, unit, compactionId);
 }
 
-public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
completed, long total, String unit, UUID compactionId)
+public CompactionInfo(CFMetaData cfm, OperationType tasktype, long 
completed, long

[4/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/trunk
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,
 +

cassandra-dtest git commit: CircleCI configuration

2018-05-14 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master bb1d95d6b -> adb0d4ce8


CircleCI configuration

reviewed by Philip Thompson for 
https://github.com/apache/cassandra-dtest/pull/28


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

Branch: refs/heads/master
Commit: adb0d4ce8bc53fe7fd75ee3dcef91c46ac69e1dd
Parents: bb1d95d
Author: Mick Semb Wever 
Authored: Mon May 14 11:07:30 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:29:15 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/adb0d4ce/.circleci/config.yml
--
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000..708a8f1
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,29 @@
+version: 2
+jobs:
+   build:
+ docker:
+   - image: circleci/python:2.7
+ steps:
+   - checkout
+   - run:
+  name: Install System Dependencies
+  command: |
+  sudo apt-get update -qq
+  sudo pip install pycodestyle==2.3.1 flake8
+  sudo pip check
+   - run:
+  name: lint
+  command: |
+# we want pyflakes to check all files for unused imports only
+# we use flake8 because it allows us to ignore other warnings
+# exclude the thrift directories - they contain auto-generated code
+flake8 --ignore=E501,F811,F812,F822,F823,F831,F841,N8,C9 
--exclude=thrift_bindings,cassandra-thrift .
+git remote add apache git://github.com/apache/cassandra-dtest.git
+git fetch apache # fetch master for the next diff
+# feed changed lines with no context around them to pycodestyle
+# I know we don't enforce line length but if you introduce
+# 200-char lines you are doing something terribly wrong.
+# lint all files for everything but line length errors
+git diff apache/master...HEAD -U0 | pycodestyle --ignore=E501 
--diff
+# lint all files except json_test.py for line length errors
+git diff apache/master...HEAD -U0 | pycodestyle --diff 
--exclude='json_test.py' --exclude='meta_tests/assertion_test.py' 
--max-line-length=200
\ No newline at end of file


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

[1/6] cassandra git commit: Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients

2018-05-14 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 b9b2a4e1a -> 6efa99c7a
  refs/heads/cassandra-3.11 28058608f -> 704f9b093
  refs/heads/trunk 45f250535 -> ecf52ed3f


Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients

 patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121


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

Branch: refs/heads/cassandra-3.0
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever 
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:05:30 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/6efa99c7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java 
b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable 
implements ProgressEventNoti
 
 protected void fireErrorAndComplete(String tag, int progressCount, int 
totalProgress, String message)
 {
-fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, message));
+fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, String.format("Repair command #%d failed with 
error %s", cmd, message)));
 fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, 
progressCount, totalProgress, String.format("Repair command #%d finished with 
error", cmd)));
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
--
diff --git 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static 
org.apache.cassandra.service.ActiveRepairService.Status;
  */
 public class LegacyJMXProgressSupport implements ProgressListener
 {
-protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*");
+protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*|Repair 
command .* failed with error .*");
 protected static final Pattern SESSION_SUCCESS_MATCHER = 
Pattern.compile("Repair session .* for range .* finished");
 
 private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements 
ProgressListener
 return Optional.of(Status.STARTED);
 case COMPLETE:
 return Optional.of(Status.FINISHED);
+case ERROR:
 case PROGRESS:
 if 
(SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
 {


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

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

2018-05-14 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: ecf52ed3f82af1ae52f202c7ed856380583e9ff6
Parents: 45f2505 704f9b0
Author: Mick Semb Wever 
Authored: Mon May 14 19:08:25 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:08:25 2018 +1000

--

--



-
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-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

[2/6] cassandra git commit: Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients

2018-05-14 Thread mck

Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients

 patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121


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

Branch: refs/heads/cassandra-3.11
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever 
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:05:30 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/6efa99c7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java 
b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable 
implements ProgressEventNoti
 
 protected void fireErrorAndComplete(String tag, int progressCount, int 
totalProgress, String message)
 {
-fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, message));
+fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, String.format("Repair command #%d failed with 
error %s", cmd, message)));
 fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, 
progressCount, totalProgress, String.format("Repair command #%d finished with 
error", cmd)));
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
--
diff --git 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static 
org.apache.cassandra.service.ActiveRepairService.Status;
  */
 public class LegacyJMXProgressSupport implements ProgressListener
 {
-protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*");
+protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*|Repair 
command .* failed with error .*");
 protected static final Pattern SESSION_SUCCESS_MATCHER = 
Pattern.compile("Repair session .* for range .* finished");
 
 private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements 
ProgressListener
 return Optional.of(Status.STARTED);
 case COMPLETE:
 return Optional.of(Status.FINISHED);
+case ERROR:
 case PROGRESS:
 if 
(SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
 {


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

[3/6] cassandra git commit: Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients

2018-05-14 Thread mck

Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients

 patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121


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

Branch: refs/heads/trunk
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever 
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:05:30 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/6efa99c7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * 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/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java 
b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable 
implements ProgressEventNoti
 
 protected void fireErrorAndComplete(String tag, int progressCount, int 
totalProgress, String message)
 {
-fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, message));
+fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, 
progressCount, totalProgress, String.format("Repair command #%d failed with 
error %s", cmd, message)));
 fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, 
progressCount, totalProgress, String.format("Repair command #%d finished with 
error", cmd)));
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
--
diff --git 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- 
a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ 
b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static 
org.apache.cassandra.service.ActiveRepairService.Status;
  */
 public class LegacyJMXProgressSupport implements ProgressListener
 {
-protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*");
+protected static final Pattern SESSION_FAILED_MATCHER = 
Pattern.compile("Repair session .* for range .* failed with error .*|Repair 
command .* failed with error .*");
 protected static final Pattern SESSION_SUCCESS_MATCHER = 
Pattern.compile("Repair session .* for range .* finished");
 
 private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements 
ProgressListener
 return Optional.of(Status.STARTED);
 case COMPLETE:
 return Optional.of(Status.FINISHED);
+case ERROR:
 case PROGRESS:
 if 
(SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
 {


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

[4/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/trunk
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

cassandra-dtest git commit: test deprecated repair error notifications from 3.x cluster to legacy JMX client

2018-05-14 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master a06c0e700 -> 3113957fb


test deprecated repair error notifications from 3.x cluster to legacy JMX client

 patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121

Closes #22


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

Branch: refs/heads/master
Commit: 3113957fb079bda7dfad009803f652946e253a92
Parents: a06c0e7
Author: Patrick Bannister 
Authored: Sun Mar 18 01:32:55 2018 +
Committer: Mick Semb Wever 
Committed: Mon May 14 19:19:58 2018 +1000

--
 repair_tests/deprecated_repair_test.py | 80 +
 1 file changed, 80 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/3113957f/repair_tests/deprecated_repair_test.py
--
diff --git a/repair_tests/deprecated_repair_test.py 
b/repair_tests/deprecated_repair_test.py
index 4c60664..739f5e6 100644
--- a/repair_tests/deprecated_repair_test.py
+++ b/repair_tests/deprecated_repair_test.py
@@ -1,10 +1,14 @@
 import pytest
 import logging
+import os
+import subprocess
 
 from distutils.version import LooseVersion
 
 from cassandra import ConsistencyLevel
 from ccmlib.common import is_win
+from ccmlib.node import handle_external_tool_process, ToolError
+import ccmlib.repository
 
 from dtest import Tester, create_ks, create_cf
 from tools.assertions import assert_length_equal
@@ -180,3 +184,79 @@ class TestDeprecatedRepairAPI(Tester):
 "data_centers": m.group("dc"),
 "hosts": m.group("hosts"),
 "ranges": m.group("ranges")}
+
+
+@since("3.0.16", max_version="4")
+class TestDeprecatedRepairNotifications(Tester):
+"""
+* @jira_ticket CASSANDRA-13121
+* Test if legacy JMX detects failures in repair jobs launched with the 
deprecated API.
+* Affects cassandra-3.x clusters when users run JMX from cassandra-2.1 and 
older to submit repair jobs.
+"""
+
+def get_legacy_environment(self, legacy_version, node_env=None):
+"""
+* Set up an environment to run nodetool from cassandra-2.1.
+"""
+env = {}
+if (node_env is not None):
+env = node_env
+legacy_dirpath = ccmlib.repository.directory_name(legacy_version)
+env["CASSANDRA_HOME"] = legacy_dirpath
+binpaths = [legacy_dirpath,
+os.path.join(legacy_dirpath, "build", "classes", "main"),
+os.path.join(legacy_dirpath, "build", "classes", "thrift")]
+env["cassandra_bin"] = ":".join(binpaths)
+env["CASSANDRA_CONF"] = os.path.join(legacy_dirpath, "conf")
+classpaths = [env["CASSANDRA_CONF"], env["cassandra_bin"]]
+for jar in os.listdir(os.path.join(legacy_dirpath, "lib")):
+if (jar.endswith(".jar")):
+classpaths.append(os.path.join(legacy_dirpath, "lib", jar))
+env['CLASSPATH'] = ":".join(classpaths)
+return env
+
+def test_deprecated_repair_error_notification(self):
+"""
+* Check whether a legacy JMX nodetool understands the
+* notification for a failed repair job.
+"""
+# This test intentionally provokes an error in a repair job
+self.fixture_dtest_setup.ignore_log_patterns = [r'Repair failed', 
r'The current host must be part of the repair']
+
+# start a 2-node cluster
+logger.debug("Starting cluster...")
+cluster = self.cluster
+cluster.populate(2)
+node1, node2 = cluster.nodelist()
+cluster.start(wait_for_binary_proto=True, wait_other_notice=True)
+
+# write some data that could be repaired
+logger.debug("Stressing node1...")
+node1.stress(stress_options=['write', 'n=5000', 'no-warmup', 'cl=ONE', 
'-schema', 'replication(factor=2)', '-rate', 'threads=5'])
+
+# set up a legacy repository
+logger.debug("Setting up legacy repository...")
+legacy_version = 'github:apache/cassandra-2.1'
+ccmlib.repository.setup(legacy_version)
+
+# Run repair with legacy nodetool.
+# The options specified will cause an error, and legacy nodetool 
should error out.
+logger.debug("Running repair on node1 using legacy nodetool (using 
options that will cause failure with error)")
+legacy_dirpath = ccmlib.repository.directory_name(legacy_version)
+legacy_nodetool_path = os.path.join(legacy_dirpath, "bin", "nodetool")
+repair_env =

cassandra-dtest git commit: Fix to pycodestyle-2.3.1 and check dependency compatibility with `pip check`

2018-05-14 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master 3113957fb -> bb1d95d6b


Fix to pycodestyle-2.3.1 and check dependency compatibility with `pip check`

 reviewed by Philip Thompson for 
https://github.com/apache/cassandra-dtest/pull/27


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

Branch: refs/heads/master
Commit: bb1d95d6bd36e131d56db9ce1d6968d2ab6224c4
Parents: 3113957
Author: Mick Semb Wever 
Authored: Mon May 14 09:05:48 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon May 14 19:25:19 2018 +1000

--
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/bb1d95d6/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index c62ad8e..27f5ac6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,8 @@ language: python
 python:
   - "2.7"
 install:
-  - pip install pycodestyle flake8
+  - pip install pycodestyle==2.3.1 flake8
+  - pip check
 script:
   # we want pyflakes to check all files for unused imports only
   # we use flake8 because it allows us to ignore other warnings


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-05-09 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: e5d997374add3342166508f4140a25f10b043464
Parents: d91cccd 72fb86d
Author: Mick Semb Wever 
Authored: Wed May 9 21:39:49 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed May 9 21:40:14 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5d99737/CHANGES.txt
--
diff --cc CHANGES.txt
index cad0e28,d8d3d6f..50a17ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,242 -1,5 +1,243 @@@
 +4.0
 + * Automatic sstable upgrades (CASSANDRA-14197)
 + * Replace deprecated junit.framework.Assert usages with org.junit.Assert 
(CASSANDRA-14431)
 + * cassandra-stress throws NPE if insert section isn't specified in user 
profile (CASSSANDRA-14426)
 + * List clients by protocol versions `nodetool clientstats --by-protocol` 
(CASSANDRA-14335)
 + * Improve LatencyMetrics performance by reducing write path processing 
(CASSANDRA-14281)
 + * Add network authz (CASSANDRA-13985)
 + * Use the correct IP/Port for Streaming when localAddress is left unbound 
(CASSANDRA-14389)
 + * nodetool listsnapshots is missing local system keyspace snapshots 
(CASSANDRA-14381)
 + * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
 + * Rename nodetool --with-port to --print-port to disambiguate from --port 
(CASSANDRA-14392)
 + * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
 + * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
 + * Eliminate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * Add a few options to nodetool verify (CASSANDRA-14201)
 + * CVE-2017-5929 Security vulnerability and redefine default log rotation 
policy (CASSANDRA-14183)
 + * Use JVM default SSL validation algorithm instead of custom default 
(CASSANDRA-13259)
 + * Better document in code InetAddressAndPort usage post 7544, incorporate 
port into UUIDGen node (CASSANDRA-14226)
 + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
 + * Make it possible to change neverPurgeTombstones during runtime 
(CASSANDRA-14214)
 + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
 + * Add nodetool clientlist (CASSANDRA-13665)
 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
 + * Non-disruptive seed node list

[2/3] cassandra git commit: NonSystemKeyspaces jmx attribute needs to return jre list, to work with command line tools like jconsole and sjk (swiss java knife)

2018-05-09 Thread mck

NonSystemKeyspaces jmx attribute needs to return jre list, to work with command 
line tools like jconsole and sjk (swiss java knife)

patch by Edward Ribeiro; reviewed by Chris Lohfink, Mick Semb Wever for 
CASSANDRA-12271


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

Branch: refs/heads/trunk
Commit: 72fb86d5a585406ae49f3adcbaf6f78ef12295ff
Parents: 78b15bf
Author: Mick Semb Wever 
Authored: Tue May 8 14:20:23 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed May 9 21:39:07 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72fb86d5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5979615..d8d3d6f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72fb86d5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index f032260..edd8571 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -4774,7 +4774,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 public List getNonSystemKeyspaces()
 {
-return 
Collections.unmodifiableList(Schema.instance.getNonSystemKeyspaces());
+List nonKeyspaceNamesList = new 
ArrayList<>(Schema.instance.getNonSystemKeyspaces());
+return Collections.unmodifiableList(nonKeyspaceNamesList);
 }
 
 public List getNonLocalStrategyKeyspaces()


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

[1/3] cassandra git commit: NonSystemKeyspaces jmx attribute needs to return jre list, to work with command line tools like jconsole and sjk (swiss java knife)

2018-05-09 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 78b15bfe5 -> 72fb86d5a
  refs/heads/trunk d91cccdde -> e5d997374


NonSystemKeyspaces jmx attribute needs to return jre list, to work with command 
line tools like jconsole and sjk (swiss java knife)

patch by Edward Ribeiro; reviewed by Chris Lohfink, Mick Semb Wever for 
CASSANDRA-12271


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

Branch: refs/heads/cassandra-3.11
Commit: 72fb86d5a585406ae49f3adcbaf6f78ef12295ff
Parents: 78b15bf
Author: Mick Semb Wever 
Authored: Tue May 8 14:20:23 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed May 9 21:39:07 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72fb86d5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5979615..d8d3d6f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72fb86d5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index f032260..edd8571 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -4774,7 +4774,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 public List getNonSystemKeyspaces()
 {
-return 
Collections.unmodifiableList(Schema.instance.getNonSystemKeyspaces());
+List nonKeyspaceNamesList = new 
ArrayList<>(Schema.instance.getNonSystemKeyspaces());
+return Collections.unmodifiableList(nonKeyspaceNamesList);
 }
 
 public List getNonLocalStrategyKeyspaces()


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-05-09 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 42687616952d0b459fbb9d245fd9650c6d851ffb
Parents: 87e8867 df94750
Author: Mick Semb Wever 
Authored: Thu May 10 12:46:27 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 10 12:47:50 2018 +1000

--
 CHANGES.txt   | 1 +
 conf/cassandra-env.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42687616/CHANGES.txt
--
diff --cc CHANGES.txt
index 051e20a,2b7530f..77b9a92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,243 -1,5 +1,244 @@@
 +4.0
 + * minor network authz improvements (Cassandra-14413)
 + * Automatic sstable upgrades (CASSANDRA-14197)
 + * Replace deprecated junit.framework.Assert usages with org.junit.Assert 
(CASSANDRA-14431)
 + * cassandra-stress throws NPE if insert section isn't specified in user 
profile (CASSSANDRA-14426)
 + * List clients by protocol versions `nodetool clientstats --by-protocol` 
(CASSANDRA-14335)
 + * Improve LatencyMetrics performance by reducing write path processing 
(CASSANDRA-14281)
 + * Add network authz (CASSANDRA-13985)
 + * Use the correct IP/Port for Streaming when localAddress is left unbound 
(CASSANDRA-14389)
 + * nodetool listsnapshots is missing local system keyspace snapshots 
(CASSANDRA-14381)
 + * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
 + * Rename nodetool --with-port to --print-port to disambiguate from --port 
(CASSANDRA-14392)
 + * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
 + * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
 + * Eliminate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * Add a few options to nodetool verify (CASSANDRA-14201)
 + * CVE-2017-5929 Security vulnerability and redefine default log rotation 
policy (CASSANDRA-14183)
 + * Use JVM default SSL validation algorithm instead of custom default 
(CASSANDRA-13259)
 + * Better document in code InetAddressAndPort usage post 7544, incorporate 
port into UUIDGen node (CASSANDRA-14226)
 + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
 + * Make it possible to change neverPurgeTombstones during runtime 
(CASSANDRA-14214)
 + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
 + * Add nodetool clientlist (CASSANDRA-13665)
 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
 + * Non-disruptive seed node list reload

[1/3] cassandra git commit: Detect OpenJDK jvm type and architecture

2018-05-09 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 72fb86d5a -> df9475086
  refs/heads/trunk 87e886789 -> 426876169


Detect OpenJDK jvm type and architecture

Patch by Stefan Podkowinski; Reviewed by Mick Semb Wever for CASSANDRA-12793


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

Branch: refs/heads/cassandra-3.11
Commit: df9475086de4c52bd050d7c31088950778dbb672
Parents: 72fb86d
Author: Mick Semb Wever 
Authored: Wed May 9 10:12:41 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 10 12:46:03 2018 +1000

--
 CHANGES.txt   | 1 +
 conf/cassandra-env.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d8d3d6f..2b7530f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 189576b..8932985 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -102,7 +102,7 @@ if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" 
-lt 40 ] ; then
 exit 1;
 fi
 
-jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print 
$1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2 
{print $1}'`
 case "$jvm" in
 OpenJDK)
 JVM_VENDOR=OpenJDK


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

[2/3] cassandra git commit: Detect OpenJDK jvm type and architecture

2018-05-09 Thread mck

Detect OpenJDK jvm type and architecture

Patch by Stefan Podkowinski; Reviewed by Mick Semb Wever for CASSANDRA-12793


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

Branch: refs/heads/trunk
Commit: df9475086de4c52bd050d7c31088950778dbb672
Parents: 72fb86d
Author: Mick Semb Wever 
Authored: Wed May 9 10:12:41 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 10 12:46:03 2018 +1000

--
 CHANGES.txt   | 1 +
 conf/cassandra-env.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d8d3d6f..2b7530f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 189576b..8932985 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -102,7 +102,7 @@ if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" 
-lt 40 ] ; then
 exit 1;
 fi
 
-jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print 
$1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2 
{print $1}'`
 case "$jvm" in
 OpenJDK)
 JVM_VENDOR=OpenJDK


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

[2/2] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-05-10 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: aba582fb4d3e0d9e46b48edea0543bfea65a00a4
Parents: f2ee3db 14bfc94
Author: Mick Semb Wever 
Authored: Fri May 11 13:37:29 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 11 13:37:29 2018 +1000

--

--



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

cassandra git commit: Upgrade metrics to fix reconnect when reporting metrics. (backported)

2018-05-10 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 df9475086 -> 14bfc9493


Upgrade metrics to fix reconnect when reporting metrics. (backported)

Patch by dr3s and Jeff Jirsa; Reviewed by Mick Semb Wever for CASSANDRA-12924


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

Branch: refs/heads/cassandra-3.11
Commit: 14bfc94937e039c25faac62ebd570ab788fdb537
Parents: df94750
Author: dr3s 
Authored: Tue Jun 20 13:23:17 2017 -0400
Committer: Mick Semb Wever 
Committed: Fri May 11 12:54:24 2018 +1000

--
 CHANGES.txt|   1 +
 build.xml  |   4 +-
 lib/licenses/metrics-core-3.1.0.txt| 202 
 lib/licenses/metrics-core-3.1.5.txt| 202 
 lib/licenses/metrics-jvm-3.1.0.txt | 202 
 lib/licenses/metrics-jvm-3.1.5.txt | 202 
 lib/licenses/metrics-logback-3.1.0.txt | 202 
 lib/licenses/metrics-logback-3.1.5.txt | 202 
 lib/metrics-core-3.1.0.jar | Bin 111908 -> 0 bytes
 lib/metrics-core-3.1.5.jar | Bin 0 -> 120465 bytes
 lib/metrics-jvm-3.1.0.jar  | Bin 35907 -> 0 bytes
 lib/metrics-jvm-3.1.5.jar  | Bin 0 -> 39283 bytes
 lib/metrics-logback-3.1.0.jar  | Bin 4130 -> 0 bytes
 lib/metrics-logback-3.1.5.jar  | Bin 0 -> 4136 bytes
 14 files changed, 609 insertions(+), 608 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b7530f..fc643ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/build.xml
--
diff --git a/build.xml b/build.xml
index 9d25d6b..f8cdf82 100644
--- a/build.xml
+++ b/build.xml
@@ -427,8 +427,8 @@
 
   
   
-  
-  
+  
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/lib/licenses/metrics-core-3.1.0.txt
--
diff --git a/lib/licenses/metrics-core-3.1.0.txt 
b/lib/licenses/metrics-core-3.1.0.txt
deleted file mode 100644
index e4ba404..000
--- a/lib/licenses/metrics-core-3.1.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
-   Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright

[1/2] cassandra git commit: Upgrade metrics to fix reconnect when reporting metrics. (backported)

2018-05-10 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk f2ee3db65 -> aba582fb4


Upgrade metrics to fix reconnect when reporting metrics. (backported)

Patch by dr3s and Jeff Jirsa; Reviewed by Mick Semb Wever for CASSANDRA-12924


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

Branch: refs/heads/trunk
Commit: 14bfc94937e039c25faac62ebd570ab788fdb537
Parents: df94750
Author: dr3s 
Authored: Tue Jun 20 13:23:17 2017 -0400
Committer: Mick Semb Wever 
Committed: Fri May 11 12:54:24 2018 +1000

--
 CHANGES.txt|   1 +
 build.xml  |   4 +-
 lib/licenses/metrics-core-3.1.0.txt| 202 
 lib/licenses/metrics-core-3.1.5.txt| 202 
 lib/licenses/metrics-jvm-3.1.0.txt | 202 
 lib/licenses/metrics-jvm-3.1.5.txt | 202 
 lib/licenses/metrics-logback-3.1.0.txt | 202 
 lib/licenses/metrics-logback-3.1.5.txt | 202 
 lib/metrics-core-3.1.0.jar | Bin 111908 -> 0 bytes
 lib/metrics-core-3.1.5.jar | Bin 0 -> 120465 bytes
 lib/metrics-jvm-3.1.0.jar  | Bin 35907 -> 0 bytes
 lib/metrics-jvm-3.1.5.jar  | Bin 0 -> 39283 bytes
 lib/metrics-logback-3.1.0.jar  | Bin 4130 -> 0 bytes
 lib/metrics-logback-3.1.5.jar  | Bin 0 -> 4136 bytes
 14 files changed, 609 insertions(+), 608 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b7530f..fc643ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/build.xml
--
diff --git a/build.xml b/build.xml
index 9d25d6b..f8cdf82 100644
--- a/build.xml
+++ b/build.xml
@@ -427,8 +427,8 @@
 
   
   
-  
-  
+  
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14bfc949/lib/licenses/metrics-core-3.1.0.txt
--
diff --git a/lib/licenses/metrics-core-3.1.0.txt 
b/lib/licenses/metrics-core-3.1.0.txt
deleted file mode 100644
index e4ba404..000
--- a/lib/licenses/metrics-core-3.1.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
-   Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is

[2/3] cassandra git commit: Fix IllegalArgumentException if there is no text between two delimiters

2018-05-17 Thread mck

Fix IllegalArgumentException if there is no text between two delimiters

patch by Mick Semb Wever; reviewed by Jason Brown for CASSANDRA-14450


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

Branch: refs/heads/trunk
Commit: 7068ef62548c1ff8d17be7d0a1e71a5f098010e6
Parents: 0d4aacc
Author: Mick Semb Wever 
Authored: Thu May 17 21:30:02 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 18 12:29:39 2018 +1000

--
 .../index/sasi/analyzer/DelimiterAnalyzer.java  | 11 ++---
 .../sasi/analyzer/DelimiterAnalyzerTest.java| 25 +++-
 2 files changed, 32 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7068ef62/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
--
diff --git 
a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java 
b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
index 794a8b9..24acef4 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
@@ -85,12 +85,17 @@ public class DelimiterAnalyzer extends AbstractAnalyzer
 
 CharBuffer readahead = cb.duplicate();
 // loop until we see the next delimiter character, or reach 
end of data
-while (readahead.hasRemaining() && readahead.get() != 
delimiter);
+boolean readaheadRemaining;
+while ((readaheadRemaining = readahead.hasRemaining()) && 
readahead.get() != delimiter);
 
-char[] chars = new char[readahead.position() - cb.position() - 
(readahead.hasRemaining() ? 1 : 0)];
+char[] chars = new char[readahead.position() - cb.position() - 
(readaheadRemaining ? 1 : 0)];
 cb.get(chars);
 Preconditions.checkState(!cb.hasRemaining() || cb.get() == 
delimiter);
-return charset.encode(CharBuffer.wrap(chars));
+
+return 0 < chars.length
+? charset.encode(CharBuffer.wrap(chars))
+// blank partition keys not permitted, ref 
ConcurrentRadixTree.putIfAbsent(..)
+: computeNext();
 }
 };
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7068ef62/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java 
b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
index 15bbb84..16f9f06 100644
--- 
a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
+++ 
b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
@@ -54,7 +54,30 @@ public class DelimiterAnalyzerTest
 while (analyzer.hasNext())
 output.append(ByteBufferUtil.string(analyzer.next()) + 
(analyzer.hasNext() ? ' ' : ""));
 
-Assert.assertTrue(testString.equals(output.toString()));
+Assert.assertEquals(testString, output.toString());
+Assert.assertFalse(testString.toLowerCase().equals(output.toString()));
+}
+
+@Test
+public void testBlankEntries() throws Exception
+{
+DelimiterAnalyzer analyzer = new DelimiterAnalyzer();
+
+analyzer.init(
+new HashMap()
+{{
+put(DelimiterTokenizingOptions.DELIMITER, ",");
+}},
+UTF8Type.instance);
+
+String testString = ",Nipit,,,in,,the,bud,,,";
+ByteBuffer toAnalyze = ByteBuffer.wrap(testString.getBytes());
+analyzer.reset(toAnalyze);
+StringBuilder output = new StringBuilder();
+while (analyzer.hasNext())
+output.append(ByteBufferUtil.string(analyzer.next()) + 
(analyzer.hasNext() ? ',' : ""));
+
+Assert.assertEquals("Nip,it,in,the,bud", output.toString());
 Assert.assertFalse(testString.toLowerCase().equals(output.toString()));
 }
 


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-05-17 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 43205143b406b914f135675fb7f1a2d06a8eeda6
Parents: d585410 7068ef6
Author: Mick Semb Wever 
Authored: Fri May 18 12:36:17 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 18 12:36:36 2018 +1000

--
 .../index/sasi/analyzer/DelimiterAnalyzer.java  | 11 ++---
 .../sasi/analyzer/DelimiterAnalyzerTest.java| 25 +++-
 2 files changed, 32 insertions(+), 4 deletions(-)
--



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

[1/3] cassandra git commit: Fix IllegalArgumentException if there is no text between two delimiters

2018-05-17 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 0d4aacc83 -> 7068ef625
  refs/heads/trunk d585410cc -> 43205143b


Fix IllegalArgumentException if there is no text between two delimiters

patch by Mick Semb Wever; reviewed by Jason Brown for CASSANDRA-14450


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

Branch: refs/heads/cassandra-3.11
Commit: 7068ef62548c1ff8d17be7d0a1e71a5f098010e6
Parents: 0d4aacc
Author: Mick Semb Wever 
Authored: Thu May 17 21:30:02 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri May 18 12:29:39 2018 +1000

--
 .../index/sasi/analyzer/DelimiterAnalyzer.java  | 11 ++---
 .../sasi/analyzer/DelimiterAnalyzerTest.java| 25 +++-
 2 files changed, 32 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7068ef62/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
--
diff --git 
a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java 
b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
index 794a8b9..24acef4 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzer.java
@@ -85,12 +85,17 @@ public class DelimiterAnalyzer extends AbstractAnalyzer
 
 CharBuffer readahead = cb.duplicate();
 // loop until we see the next delimiter character, or reach 
end of data
-while (readahead.hasRemaining() && readahead.get() != 
delimiter);
+boolean readaheadRemaining;
+while ((readaheadRemaining = readahead.hasRemaining()) && 
readahead.get() != delimiter);
 
-char[] chars = new char[readahead.position() - cb.position() - 
(readahead.hasRemaining() ? 1 : 0)];
+char[] chars = new char[readahead.position() - cb.position() - 
(readaheadRemaining ? 1 : 0)];
 cb.get(chars);
 Preconditions.checkState(!cb.hasRemaining() || cb.get() == 
delimiter);
-return charset.encode(CharBuffer.wrap(chars));
+
+return 0 < chars.length
+? charset.encode(CharBuffer.wrap(chars))
+// blank partition keys not permitted, ref 
ConcurrentRadixTree.putIfAbsent(..)
+: computeNext();
 }
 };
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7068ef62/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java 
b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
index 15bbb84..16f9f06 100644
--- 
a/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
+++ 
b/test/unit/org/apache/cassandra/index/sasi/analyzer/DelimiterAnalyzerTest.java
@@ -54,7 +54,30 @@ public class DelimiterAnalyzerTest
 while (analyzer.hasNext())
 output.append(ByteBufferUtil.string(analyzer.next()) + 
(analyzer.hasNext() ? ' ' : ""));
 
-Assert.assertTrue(testString.equals(output.toString()));
+Assert.assertEquals(testString, output.toString());
+Assert.assertFalse(testString.toLowerCase().equals(output.toString()));
+}
+
+@Test
+public void testBlankEntries() throws Exception
+{
+DelimiterAnalyzer analyzer = new DelimiterAnalyzer();
+
+analyzer.init(
+new HashMap()
+{{
+put(DelimiterTokenizingOptions.DELIMITER, ",");
+}},
+UTF8Type.instance);
+
+String testString = ",Nipit,,,in,,the,bud,,,";
+ByteBuffer toAnalyze = ByteBuffer.wrap(testString.getBytes());
+analyzer.reset(toAnalyze);
+StringBuilder output = new StringBuilder();
+while (analyzer.hasNext())
+output.append(ByteBufferUtil.string(analyzer.next()) + 
(analyzer.hasNext() ? ',' : ""));
+
+Assert.assertEquals("Nip,it,in,the,bud", output.toString());
 Assert.assertFalse(testString.toLowerCase().equals(output.toString()));
 }
 


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

[1/2] cassandra-dtest git commit: Remove doxygen and references to it.

2018-05-16 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master adb0d4ce8 -> 0fd9a55b9


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/0fd9a55b/doxygen/Doxyfile_python
--
diff --git a/doxygen/Doxyfile_python b/doxygen/Doxyfile_python
deleted file mode 100644
index 2891612..000
--- a/doxygen/Doxyfile_python
+++ /dev/null
@@ -1,2336 +0,0 @@
-# Doxyfile 1.8.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---
-# Project related configuration options
-#---
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all 
text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See 
http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING  = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME   = "Cassandra-Dtest"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF  =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the 
logo
-# to the output directory.
-
-PROJECT_LOGO   =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY   =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format 
and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, 
where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES= NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, 
Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, 
Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE= English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default

[2/2] cassandra-dtest git commit: Remove doxygen and references to it.

2018-05-16 Thread mck

Remove  doxygen and references to it.


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

Branch: refs/heads/master
Commit: 0fd9a55b964bee4218d5d617895be9fa34a49985
Parents: adb0d4c
Author: Mick Semb Wever 
Authored: Wed May 16 07:44:30 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed May 16 07:44:30 2018 +1000

--
 CONTRIBUTING.md |   27 +-
 doxygen/Doxyfile_python | 2336 --
 doxygen/doxypy-0.4.2.tar.gz |  Bin 4455 -> 0 bytes
 3 files changed, 3 insertions(+), 2360 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/0fd9a55b/CONTRIBUTING.md
--
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6131160..5c9e72a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,9 +24,9 @@ connect to C*.
 
 All version objects being passed from CCM are now LooseVersion objects, 
instead of strings. Those can still be safely compared to strings, so there is 
no need to do `version < LooseVersion('3.10')`.
 
-## Doxygen Docstrings
+## Documentation
 
-We are now colocating our test plans directly with the source code. We have 
decided to do so in a manner compatible with Doxygen, to turn the test plans 
into easily navigated HTML. Please view the following list of tags, as well as 
an example test. While this full list of tags is available for use, there is no 
need to use every tag for a given test. The **description** and **since** 
fields should be included, but most others should only be used when 
**appropriate**. The test plan will live in a comment block below the test 
method declaration.
+Please view the following list of tags, as well as an example test. While this 
full list of tags is available for use, there is no need to use every tag for a 
given test. The **description** and **jira_ticket** fields should be included, 
but most others should only be used when **appropriate**. The test plan will 
live in a comment block below the test method declaration.
 
 
 Input | Description
@@ -37,7 +37,6 @@ Description   | Brief description of the test
 @return   | Description of expected return value (Usually used for 
helper methods)
 @expected_errors  | What exceptions this test is expected to throw on normal 
behavior (should be caught and expected in the test)
 @throws   | What exceptions this test would throw upon failure (if 
expecting a specific regression)
-@since| I am unsure what we will use this for. Do not use until we 
have reached a decision.
 @jira_ticket  | Associated JIRA ticket identifier, including the project 
name (e.g. `CASSANDRA-42`, not `42`).
 @expected_result  | Brief summary of what the expected results of this test are
 @test_assumptions | Test requirements (auth, hints disabled , etc)
@@ -48,32 +47,13 @@ Description   | Brief description of the test
 ```python
 def test_example(self):
 """
-Demonstrates the expected syntax for a test plan. Parsed by Doxygen.
+Demonstrates the expected syntax for a test plan.
 @jira_ticket CASSANDRA-
-@since 2.0.15, 2.1.5
 @note Test should not be implemented, it is an example.
 """
 pass
 ```
 
-To run doxygen to generate HTML from these test plans, you will need to do the 
following:
-
-* Unzip **doxygen/doxypy-0.4.2.tar.gz** and install it
-```
-cd doxygen/
-tar xvf doxypy-0.4.2.tar.gz
-cd doxypy-0.4.2
-sudo python setup.py install
-```
-* Install **doxygen**, via your system's package manager
-* Edit the **INPUT** and **OUTPUT_DIRECTORY** fields in 
**doxygen/Doxyfile_python**. They must be absolute paths. **INPUT** should 
point to **cassandra-dtest/**.
-* Run doxygen
-```
-doxygen doxygen/Doxyfile_python
-```
-
-Feel free to submit test plans without the implemented tests. If you are 
submitting a new test, we would appreciate if it were annotated in this manner. 
If that is not possible, we will add the markup to your pull request.
-
 ## Modules
 
 In some cases, we organize our test files by putting them in directories. If 
you do so, please export a module from that directory by placing an 
`__init__.py` file in the directory with the test files. This makes the modules 
visible to our test infrastructure scripts that divide tests into buckets for 
CI.
@@ -82,7 +62,6 @@ In some cases, we organize our test files by putting them in 
directories. If you
 
 - When possible, you should use the assert functions from

cassandra-dtest git commit: WIP – Fix flake8 violations, so travis and circleci pass

2018-05-18 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/mck/fix-codestyle-violations [created] 557d01231


WIP âÂ Fix flake8 violations, so travis and circleci pass


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

Branch: refs/heads/mck/fix-codestyle-violations
Commit: 557d01231dbecce94d312f4e61c258292f239e79
Parents: 0fd9a55
Author: Mick Semb Wever <m...@apache.org>
Authored: Wed May 16 18:35:11 2018 +1000
Committer: Mick Semb Wever <m...@apache.org>
Committed: Sat May 19 09:11:06 2018 +1000

--
 cqlsh_tests/cqlsh_copy_tests.py| 41 ++---
 cqlsh_tests/cqlsh_tools.py |  5 ---
 upgrade_tests/cql_tests.py | 16 +---
 upgrade_tests/paging_test.py   |  2 +-
 upgrade_tests/storage_engine_upgrade_test.py   |  8 ++--
 upgrade_tests/thrift_upgrade_test.py   | 39 +++-
 upgrade_tests/upgrade_base.py  |  4 +-
 upgrade_tests/upgrade_compact_storage.py   | 16 
 upgrade_tests/upgrade_supercolumns_test.py | 16 ++--
 upgrade_tests/upgrade_through_versions_test.py | 22 ++-
 10 files changed, 83 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/557d0123/cqlsh_tests/cqlsh_copy_tests.py
--
diff --git a/cqlsh_tests/cqlsh_copy_tests.py b/cqlsh_tests/cqlsh_copy_tests.py
index 9769fd7..0812b1b 100644
--- a/cqlsh_tests/cqlsh_copy_tests.py
+++ b/cqlsh_tests/cqlsh_copy_tests.py
@@ -25,8 +25,8 @@ from cassandra.util import SortedSet
 from ccmlib.common import is_win
 
 from .cqlsh_tools import (DummyColorMap, assert_csvs_items_equal, csv_rows,
- monkeypatch_driver, random_list, unmonkeypatch_driver,
- write_rows_to_csv)
+  monkeypatch_driver, random_list, 
unmonkeypatch_driver,
+  write_rows_to_csv)
 from dtest import (Tester, create_ks)
 from tools.data import rows_to_list
 from tools.metadata_wrapper import (UpdatingClusterMetadataWrapper,
@@ -386,7 +386,7 @@ class TestCqlshCopy(Tester):
 except Exception as e:
 if len(csv_results) != len(processed_results):
 logger.warning("Different # of entries. CSV: " + 
str(len(csv_results)) +
-" vs results: " + str(len(processed_results)))
+   " vs results: " + str(len(processed_results)))
 elif csv_results[0] is not None:
 for x in range(0, len(csv_results[0])):
 if csv_results[0][x] != processed_results[0][x]:
@@ -398,7 +398,6 @@ class TestCqlshCopy(Tester):
 def make_csv_formatter(self, time_format, nullval):
 with self._cqlshlib() as cqlshlib:  # noqa
 from cqlshlib.formatting import format_value, format_value_default
-from cqlshlib.displaying import NO_COLOR_MAP
 try:
 from cqlshlib.formatting import DateTimeFormat
 date_time_format = DateTimeFormat()
@@ -875,8 +874,8 @@ class TestCqlshCopy(Tester):
 csv_values = list(csv.reader(csvfile))
 
 assert csv_values == [['1', '2015/01/01 07:00'],
-   ['2', '2015/06/10 12:30'],
-   ['3', '2015/12/31 23:59']]
+['2', '2015/06/10 12:30'],
+['3', '2015/12/31 23:59']]
 
 self.session.execute("TRUNCATE testdatetimeformat")
 cmds = "COPY ks.testdatetimeformat FROM 
'{name}'".format(name=tempfile.name)
@@ -890,7 +889,7 @@ class TestCqlshCopy(Tester):
 
 imported_results = list(self.session.execute("SELECT * FROM 
testdatetimeformat"))
 assert self.result_to_csv_rows(exported_results, cql_type_names, 
time_format=format) \
-   == self.result_to_csv_rows(imported_results, cql_type_names, 
time_format=format)
+== self.result_to_csv_rows(imported_results, cql_type_names, 
time_format=format)
 
 @since('3.2')
 def test_reading_with_ttl(self):
@@ -1103,7 +1102,7 @@ class TestCqlshCopy(Tester):
 
 tempfile = self.get_temp_file()
 logger.debug('Exporting tokens {} - {} for {} records to csv file: 
{}'.format(begin_token, end_token,
-   
num_records, tempfile.name))
+ num_records, tempfile.name))
 cmds = "COPY ks.testtokens TO '{}'".format(tempfile.

[cassandra-dtest] Git Push Summary

2018-05-18 Thread mck

Repository: cassandra-dtest
Updated Branches:
  refs/heads/mck/fix-codestyle-violations [deleted] 557d01231

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

cassandra git commit: Fix assertions in PaxosState and PrepareResponse after TableMetadata was made immutable

2018-06-18 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 255242237 -> 717c10837


Fix assertions in PaxosState and PrepareResponse after TableMetadata was made 
immutable

Patch by Michael Burman; reviewed by Mick Semb Wever for CASSANDRA-14356


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

Branch: refs/heads/trunk
Commit: 717c108374a56897d10fcad41fe82b43e2192648
Parents: 2552422
Author: Mick Semb Wever 
Authored: Sun Jun 17 14:29:00 2018 +1000
Committer: Mick Semb Wever 
Committed: Mon Jun 18 20:03:27 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c1083/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4ea32c9..fd236a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Fix assertions in LWTs after TableMetadata was made immutable 
(CASSANDRA-14356)
  * Abort compactions quicker (CASSANDRA-14397)
  * Support light-weight transactions in cassandra-stress (CASSANDRA-13529)
  * Make AsyncOneResponse use the correct timeout (CASSANDRA-14509)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c1083/src/java/org/apache/cassandra/service/paxos/PaxosState.java
--
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java 
b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
index 7d59374..6e02435 100644
--- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java
+++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -46,7 +46,7 @@ public class PaxosState
 public PaxosState(Commit promised, Commit accepted, Commit 
mostRecentCommit)
 {
 assert 
promised.update.partitionKey().equals(accepted.update.partitionKey()) && 
accepted.update.partitionKey().equals(mostRecentCommit.update.partitionKey());
-assert promised.update.metadata() == accepted.update.metadata() && 
accepted.update.metadata() == mostRecentCommit.update.metadata();
+assert 
promised.update.metadata().id.equals(accepted.update.metadata().id) && 
accepted.update.metadata().id.equals(mostRecentCommit.update.metadata().id);
 
 this.promised = promised;
 this.accepted = accepted;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c1083/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java
--
diff --git a/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java 
b/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java
index 2110dd7..4c7becc 100644
--- a/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java
+++ b/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java
@@ -45,7 +45,7 @@ public class PrepareResponse
 public PrepareResponse(boolean promised, Commit inProgressCommit, Commit 
mostRecentCommit)
 {
 assert 
inProgressCommit.update.partitionKey().equals(mostRecentCommit.update.partitionKey());
-assert inProgressCommit.update.metadata() == 
mostRecentCommit.update.metadata();
+assert 
inProgressCommit.update.metadata().id.equals(mostRecentCommit.update.metadata().id);
 
 this.promised = promised;
 this.mostRecentCommit = mostRecentCommit;


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

[02/10] cassandra git commit: Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

2018-06-13 Thread mck

Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when 
the java driver will."

This reverts commit 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e.

See 
https://issues.apache.org/jira/browse/CASSANDRA-10751?focusedCommentId=16511413=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16511413


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

Branch: refs/heads/cassandra-3.0
Commit: 1143bc113dc456675a2f3a89c93fba8ce117ac3f
Parents: fc7a69b
Author: Mick Semb Wever 
Authored: Thu Jun 14 07:48:27 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 07:48:27 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9faf499..7b1089e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.2.13
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
- * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 18b2f50..b3e440d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(keyspace);
+session = cluster.connect(quote(keyspace));
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-06-13 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 897b55a6b56130cb8b9c0af3907b788011623b37
Parents: cce9ab2 1143bc1
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:30:28 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:31:43 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/CHANGES.txt
--
diff --cc CHANGES.txt
index dfdfbfd,7b1089e..94fbcd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,33 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * 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)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-06-13 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 897b55a6b56130cb8b9c0af3907b788011623b37
Parents: cce9ab2 1143bc1
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:30:28 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:31:43 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/CHANGES.txt
--
diff --cc CHANGES.txt
index dfdfbfd,7b1089e..94fbcd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,33 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * 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)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[01/10] cassandra git commit: Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

2018-06-13 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 fc7a69b65 -> 1143bc113
  refs/heads/cassandra-3.0 cce9ab236 -> 897b55a6b
  refs/heads/cassandra-3.11 ed5f8347e -> f0403b4e9
  refs/heads/trunk bdb52801c -> 3b56d4df4


Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when 
the java driver will."

This reverts commit 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e.

See 
https://issues.apache.org/jira/browse/CASSANDRA-10751?focusedCommentId=16511413=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16511413


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

Branch: refs/heads/cassandra-2.2
Commit: 1143bc113dc456675a2f3a89c93fba8ce117ac3f
Parents: fc7a69b
Author: Mick Semb Wever 
Authored: Thu Jun 14 07:48:27 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 07:48:27 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9faf499..7b1089e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.2.13
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
- * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 18b2f50..b3e440d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(keyspace);
+session = cluster.connect(quote(keyspace));
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-06-13 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 897b55a6b56130cb8b9c0af3907b788011623b37
Parents: cce9ab2 1143bc1
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:30:28 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:31:43 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/CHANGES.txt
--
diff --cc CHANGES.txt
index dfdfbfd,7b1089e..94fbcd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,33 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * 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)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-06-13 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 3b56d4df40800f76dcf2c0019af43b7dbc244c57
Parents: bdb5280 f0403b4
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:33:41 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:36:28 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b56d4df/CHANGES.txt
--
diff --cc CHANGES.txt
index 49738cd,083f480..24aaabb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -293,7 -45,7 +293,6 @@@ 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.2:
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
 - * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/cassandra-3.11
Commit: f0403b4e9d0ebe0dab1a96c81f122e780c369e4b
Parents: ed5f834 897b55a
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:32:37 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:33:11 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0403b4e/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[03/10] cassandra git commit: Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

2018-06-13 Thread mck

Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when 
the java driver will."

This reverts commit 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e.

See 
https://issues.apache.org/jira/browse/CASSANDRA-10751?focusedCommentId=16511413=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16511413


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

Branch: refs/heads/cassandra-3.11
Commit: 1143bc113dc456675a2f3a89c93fba8ce117ac3f
Parents: fc7a69b
Author: Mick Semb Wever 
Authored: Thu Jun 14 07:48:27 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 07:48:27 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9faf499..7b1089e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.2.13
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
- * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 18b2f50..b3e440d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(keyspace);
+session = cluster.connect(quote(keyspace));
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/trunk
Commit: f0403b4e9d0ebe0dab1a96c81f122e780c369e4b
Parents: ed5f834 897b55a
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:32:37 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:33:11 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0403b4e/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[04/10] cassandra git commit: Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

2018-06-13 Thread mck

Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when 
the java driver will."

This reverts commit 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e.

See 
https://issues.apache.org/jira/browse/CASSANDRA-10751?focusedCommentId=16511413=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16511413


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

Branch: refs/heads/trunk
Commit: 1143bc113dc456675a2f3a89c93fba8ce117ac3f
Parents: fc7a69b
Author: Mick Semb Wever 
Authored: Thu Jun 14 07:48:27 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 07:48:27 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9faf499..7b1089e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.2.13
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
- * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 18b2f50..b3e440d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(keyspace);
+session = cluster.connect(quote(keyspace));
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[09/10] 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/73f5b8f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f5b8f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f5b8f9

Branch: refs/heads/trunk
Commit: 73f5b8f995da0a56babac588a5476397604b707e
Parents: 2d19de1 493f9a2
Author: Mick Semb Wever 
Authored: Thu May 3 18:56:29 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:57:14 2018 +1000

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[08/10] 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/73f5b8f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f5b8f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f5b8f9

Branch: refs/heads/cassandra-3.11
Commit: 73f5b8f995da0a56babac588a5476397604b707e
Parents: 2d19de1 493f9a2
Author: Mick Semb Wever 
Authored: Thu May 3 18:56:29 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:57:14 2018 +1000

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-05-03 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever 
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:45:59 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
--
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[02/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

2018-05-03 Thread mck

CqlRecordReader unnecessarily quotes the keyspace when connecting, when the 
java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


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

Branch: refs/heads/cassandra-3.0
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever 
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:39:55 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(quote(keyspace));
+session = cluster.connect(keyspace);
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-05-03 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever 
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:45:59 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
--
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[03/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

2018-05-03 Thread mck

CqlRecordReader unnecessarily quotes the keyspace when connecting, when the 
java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


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

Branch: refs/heads/cassandra-3.11
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever 
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:39:55 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(quote(keyspace));
+session = cluster.connect(keyspace);
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-05-03 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever 
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:45:59 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
--
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * 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)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * 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)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[01/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

2018-05-03 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 3a713827f -> 1b0b113fa
  refs/heads/cassandra-3.0 eb68c3126 -> 493f9a2b4
  refs/heads/cassandra-3.11 2d19de1cf -> 73f5b8f99
  refs/heads/trunk 60ed982d5 -> dd091d417


CqlRecordReader unnecessarily quotes the keyspace when connecting, when the 
java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


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

Branch: refs/heads/cassandra-2.2
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever 
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:39:55 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(quote(keyspace));
+session = cluster.connect(keyspace);
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[04/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

2018-05-03 Thread mck

CqlRecordReader unnecessarily quotes the keyspace when connecting, when the 
java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


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

Branch: refs/heads/trunk
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever 
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:39:55 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader
 }
 
 if (cluster != null)
-session = cluster.connect(quote(keyspace));
+session = cluster.connect(keyspace);
 
 if (session == null)
   throw new RuntimeException("Can't create connection session");


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-05-03 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: dd091d417ccca7764cdf016c2921d97121a236c5
Parents: 60ed982 73f5b8f
Author: Mick Semb Wever 
Authored: Thu May 3 19:27:12 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 19:52:28 2018 +1000

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


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


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

cassandra git commit: Use new token allocation for non bootstrap case as well.

2018-02-12 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 f6ec5c5d1 -> 8a5e88f63


Use new token allocation for non bootstrap case as well.

> patch by Dikang Gu; reviewed by Branimir Lambov for CASSANSRA-13080
backported by Mick Semb Wever; reviewed by Jon Haddad for CASSANSRA-14212


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

Branch: refs/heads/cassandra-3.11
Commit: 8a5e88f635fdb984505a99a553b5799cedccd06d
Parents: f6ec5c5
Author: Dikang Gu 
Authored: Tue Dec 27 11:55:13 2016 -0800
Committer: Mick Semb Wever 
Committed: Tue Feb 13 08:02:02 2018 +1100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/dht/BootStrapper.java  | 18 +++--
 .../dht/tokenallocator/TokenAllocation.java |  3 -
 .../cassandra/service/StorageService.java   | 69 +---
 .../apache/cassandra/dht/BootStrapperTest.java  |  2 +-
 5 files changed, 48 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5e88f6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index bce7e1d..ba72406 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.2
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5e88f6/src/java/org/apache/cassandra/dht/BootStrapper.java
--
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java 
b/src/java/org/apache/cassandra/dht/BootStrapper.java
index 392dbf2..1e00f48 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -33,12 +33,15 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.dht.tokenallocator.TokenAllocation;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
 import org.apache.cassandra.locator.TokenMetadata;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.streaming.*;
+import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.progress.ProgressEvent;
 import org.apache.cassandra.utils.progress.ProgressEventNotifierSupport;
 import org.apache.cassandra.utils.progress.ProgressEventType;
@@ -155,7 +158,7 @@ public class BootStrapper extends 
ProgressEventNotifierSupport
  * otherwise, if allocationKeyspace is specified use the token allocation 
algorithm to generate suitable tokens
  * else choose num_tokens tokens at random
  */
-public static Collection getBootstrapTokens(final TokenMetadata 
metadata, InetAddress address) throws ConfigurationException
+public static Collection getBootstrapTokens(final TokenMetadata 
metadata, InetAddress address, int schemaWaitDelay) throws 
ConfigurationException
 {
 String allocationKeyspace = 
DatabaseDescriptor.getAllocateTokensForKeyspace();
 Collection initialTokens = 
DatabaseDescriptor.getInitialTokens();
@@ -171,7 +174,7 @@ public class BootStrapper extends 
ProgressEventNotifierSupport
 throw new ConfigurationException("num_tokens must be >= 1");
 
 if (allocationKeyspace != null)
-return allocateTokens(metadata, address, allocationKeyspace, 
numTokens);
+return allocateTokens(metadata, address, allocationKeyspace, 
numTokens, schemaWaitDelay);
 
 if (numTokens == 1)
 logger.warn("Picking random token for a single vnode.  You should 
probably add more vnodes and/or use the automatic token allocation mechanism.");
@@ -182,7 +185,7 @@ public class BootStrapper extends 
ProgressEventNotifierSupport
 private static Collection getSpecifiedTokens(final TokenMetadata 
metadata,
 Collection 
initialTokens)
 {
-logger.trace("tokens manually specified as {}",  initialTokens);
+logger.info("tokens manually specified as {}",

[03/10] cassandra git commit: Fix incorrect cqlsh results when selecting same columns multiple times

2018-09-04 Thread mck

Fix incorrect cqlsh results when selecting same columns multiple times

Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262


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

Branch: refs/heads/cassandra-3.11
Commit: 62e48c5f3f818d1e841178d7365d208435a63537
Parents: 49adbe7
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:13:49 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:13:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f3de388..71c57ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 
 2.2.13

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e242d42..3d0e056 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1313,7 +1313,7 @@ class Shell(cmd.Cmd):
 # print header only
 self.print_formatted_result(formatted_names, None)
 return
-formatted_values = [map(self.myformat_value, row.values()) for row in 
rows]
+formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 
 if self.expand_enabled:
 self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/trunk
Commit: 0aca1b9df8b594710e6fbe820bd54ed17dc3176e
Parents: d8b7630 21ec39a
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:19:22 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:20:12 2018 +1000

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aca1b9d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 801a8f7,1f1fa47..71f8491
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1116,14 -1374,7 +1116,14 @@@ class Shell(cmd.Cmd)
  # print header only
  self.print_formatted_result(formatted_names, None)
  return
 -formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 +
 +cql_types = []
 +if result.column_types:
 +ks_name = table_meta.keyspace_name if table_meta else 
self.current_keyspace
 +ks_meta = self.conn.metadata.keyspaces.get(ks_name, None)
 +cql_types = [CqlType(cql_typename(t), ks_meta) for t in 
result.column_types]
 +
- formatted_values = [map(self.myformat_value, row.values(), cql_types) 
for row in result.current_rows]
++formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names], cql_types) for row in result.current_rows]
  
  if self.expand_enabled:
  self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/cassandra-3.11
Commit: 0aca1b9df8b594710e6fbe820bd54ed17dc3176e
Parents: d8b7630 21ec39a
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:19:22 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:20:12 2018 +1000

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aca1b9d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 801a8f7,1f1fa47..71f8491
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1116,14 -1374,7 +1116,14 @@@ class Shell(cmd.Cmd)
  # print header only
  self.print_formatted_result(formatted_names, None)
  return
 -formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 +
 +cql_types = []
 +if result.column_types:
 +ks_name = table_meta.keyspace_name if table_meta else 
self.current_keyspace
 +ks_meta = self.conn.metadata.keyspaces.get(ks_name, None)
 +cql_types = [CqlType(cql_typename(t), ks_meta) for t in 
result.column_types]
 +
- formatted_values = [map(self.myformat_value, row.values(), cql_types) 
for row in result.current_rows]
++formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names], cql_types) for row in result.current_rows]
  
  if self.expand_enabled:
  self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[01/10] cassandra git commit: Fix incorrect cqlsh results when selecting same columns multiple times

2018-09-04 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 49adbe7e0 -> 62e48c5f3
  refs/heads/cassandra-3.0 d049c6b9b -> 21ec39a9d
  refs/heads/cassandra-3.11 d8b7630fe -> 0aca1b9df
  refs/heads/trunk d26f142b3 -> 744973e4c


Fix incorrect cqlsh results when selecting same columns multiple times

Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262


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

Branch: refs/heads/cassandra-2.2
Commit: 62e48c5f3f818d1e841178d7365d208435a63537
Parents: 49adbe7
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:13:49 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:13:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f3de388..71c57ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 
 2.2.13

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e242d42..3d0e056 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1313,7 +1313,7 @@ class Shell(cmd.Cmd):
 # print header only
 self.print_formatted_result(formatted_names, None)
 return
-formatted_values = [map(self.myformat_value, row.values()) for row in 
rows]
+formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 
 if self.expand_enabled:
 self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[04/10] cassandra git commit: Fix incorrect cqlsh results when selecting same columns multiple times

2018-09-04 Thread mck

Fix incorrect cqlsh results when selecting same columns multiple times

Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262


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

Branch: refs/heads/trunk
Commit: 62e48c5f3f818d1e841178d7365d208435a63537
Parents: 49adbe7
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:13:49 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:13:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f3de388..71c57ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 
 2.2.13

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e242d42..3d0e056 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1313,7 +1313,7 @@ class Shell(cmd.Cmd):
 # print header only
 self.print_formatted_result(formatted_names, None)
 return
-formatted_values = [map(self.myformat_value, row.values()) for row in 
rows]
+formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 
 if self.expand_enabled:
 self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-09-04 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 21ec39a9d66b66ce6ca814522eb047cdec0c454f
Parents: d049c6b 62e48c5
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:15:47 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:17:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21ec39a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 7049180,71c57ea..d55ddb6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -2.2.14
 +3.0.18
 + * 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)
 + Merged from 2.2:
+  * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
 -2.2.13
 +
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * 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)
 + * 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)
 + * 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
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

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


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

[02/10] cassandra git commit: Fix incorrect cqlsh results when selecting same columns multiple times

2018-09-04 Thread mck

Fix incorrect cqlsh results when selecting same columns multiple times

Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262


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

Branch: refs/heads/cassandra-3.0
Commit: 62e48c5f3f818d1e841178d7365d208435a63537
Parents: 49adbe7
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:13:49 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:13:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f3de388..71c57ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 
 2.2.13

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e48c5f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e242d42..3d0e056 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1313,7 +1313,7 @@ class Shell(cmd.Cmd):
 # print header only
 self.print_formatted_result(formatted_names, None)
 return
-formatted_values = [map(self.myformat_value, row.values()) for row in 
rows]
+formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 
 if self.expand_enabled:
 self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-09-04 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 21ec39a9d66b66ce6ca814522eb047cdec0c454f
Parents: d049c6b 62e48c5
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:15:47 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:17:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21ec39a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 7049180,71c57ea..d55ddb6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -2.2.14
 +3.0.18
 + * 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)
 + Merged from 2.2:
+  * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
 -2.2.13
 +
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * 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)
 + * 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)
 + * 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
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

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


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

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-09-04 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 21ec39a9d66b66ce6ca814522eb047cdec0c454f
Parents: d049c6b 62e48c5
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:15:47 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:17:49 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21ec39a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 7049180,71c57ea..d55ddb6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -2.2.14
 +3.0.18
 + * 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)
 + Merged from 2.2:
+  * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
 -2.2.13
 +
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * 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)
 + * 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)
 + * 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
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * 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)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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)
 + * 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)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-09-04 Thread mck

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 744973e4cb659c774e817b4fc553c6361f1f05ec
Parents: d26f142 0aca1b9
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:25:17 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:25:17 2018 +1000

--

--



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

cassandra git commit: Add developers docs for creating releases

2018-09-06 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5fbb938ad -> 63e5763b7


Add developers docs for creating releases

Patch by Mick Semb Wever; reviewed by Michael Shuler, Stefan Podkowinski for 
CASSANDRA-14689
This closes #230


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

Branch: refs/heads/trunk
Commit: 63e5763b7ac5dd8f769a9ecedfabfa4d585215bd
Parents: 5fbb938
Author: Mick Semb Wever 
Authored: Sat Jun 2 12:28:13 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri Sep 7 08:46:59 2018 +1000

--
 doc/source/development/index.rst   |   1 +
 doc/source/development/release_process.rst | 260 
 2 files changed, 261 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63e5763b/doc/source/development/index.rst
--
diff --git a/doc/source/development/index.rst b/doc/source/development/index.rst
index 898bbff..ffa7134 100644
--- a/doc/source/development/index.rst
+++ b/doc/source/development/index.rst
@@ -30,3 +30,4 @@ Contributing to Cassandra
documentation
ci
dependencies
+   release_process

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63e5763b/doc/source/development/release_process.rst
--
diff --git a/doc/source/development/release_process.rst 
b/doc/source/development/release_process.rst
new file mode 100644
index 000..d5deff9
--- /dev/null
+++ b/doc/source/development/release_process.rst
@@ -0,0 +1,260 @@
+.. 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.
+
+.. highlight:: none
+..  release_process:
+
+Release Process
+***
+
+.. contents:: :depth: 3
+
+|Â 
+|
+
+.. attention::
+
+WORK IN PROGRESS
+ * A number of these steps still have been finalised/tested.
+ * The use of people.apache.org needs to be replaced with svnpubsub and 
dist.apache.org
+
+
+The steps for Release Managers to create, vote and publish releases for Apache 
Cassandra.
+
+While a committer can perform the initial steps of creating and calling a vote 
on a proposed release, only a PMC can complete the process of publishing and 
announcing the release.
+
+
+Prerequisites
+=
+
+Background docs
+ * `ASF Release Policy `_
+ * `ASF Release Distribution Policy 
`_
+ * `ASF Release Best Practices 
`_
+
+
+A debian based linux OS is required to run the release steps from. 
Debian-based distros provide the required RPM, dpkg and repository management 
tools.
+
+
+Create and publish your GPG key
+---
+
+To create a GPG key, follow the `guidelines 
`_.
+Include your public key in::
+
+  https://dist.apache.org/repos/dist/cassandra/KEYS
+
+
+Publish your GPG key in a PGP key server, such as `MIT Keyserver 
`_.
+
+
+Create Release Artifacts
+
+
+Any committer can perform the following steps to create and call a vote on a 
proposed release.
+
+Check that no open jira tickets are urgent and currently being worked on.
+Also check with a PMC that there's security vulnerabilities currently being 
worked on in private.
+
+Perform the Release
+---
+
+Run the following commands to generate and upload release artifacts, to a 
nexus staging repository and distribution location::
+
+
+cd ~/git
+git clone https://github.com/apache/cassandra-builds.git
+# Edit the variables at the top of 
`cassandra-builds/cassandra-release/prepare_release.sh`
+
+# After cloning cassandra-builds repo, the prepare_release.sh is run from 
the actual cassandra git checkout, 
+# on the branch/commit that we wish to tag for the

[01/10] cassandra git commit: ninja fix to f8912ce – Stop SSTables being lost from compaction strategy after full repairs

2018-07-10 Thread mck

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 9ff78249a -> 3482370df
  refs/heads/cassandra-3.0 8ead7af14 -> 6ce887e58
  refs/heads/cassandra-3.11 847b84323 -> 6bcc60ae4
  refs/heads/trunk 28217f857 -> f081558d6


ninja fix to f8912ce â Stop SSTables being lost from compaction strategy 
after full repairs

 patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14423


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

Branch: refs/heads/cassandra-2.2
Commit: 3482370df5672c9337a16a8a52baba53b70a4fe8
Parents: 9ff7824
Author: Mick Semb Wever 
Authored: Tue Jul 10 10:25:50 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:06 2018 +1000

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3482370d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 013fc04..c37049f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -27,6 +27,7 @@ import javax.management.ObjectName;
 import javax.management.openmbean.OpenDataException;
 import javax.management.openmbean.TabularData;
 
+import org.apache.commons.lang3.StringUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -581,7 +582,7 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 
 if (!anticompactRanges.isEmpty())
-logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, String.join(", ", anticompactRanges));
+logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, StringUtils.join(anticompactRanges, ", "));
 
 if (!shouldAnticompact)
 {


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

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2018-07-10 Thread mck

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 6ce887e58ac193eb53ecd75d79ead5a93ebda005
Parents: 8ead7af 3482370
Author: Mick Semb Wever 
Authored: Wed Jul 11 10:16:23 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:23 2018 +1000

--

--



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

[02/10] cassandra git commit: ninja fix to f8912ce – Stop SSTables being lost from compaction strategy after full repairs

2018-07-10 Thread mck

ninja fix to f8912ce â Stop SSTables being lost from compaction strategy 
after full repairs

 patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14423


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

Branch: refs/heads/cassandra-3.0
Commit: 3482370df5672c9337a16a8a52baba53b70a4fe8
Parents: 9ff7824
Author: Mick Semb Wever 
Authored: Tue Jul 10 10:25:50 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:06 2018 +1000

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3482370d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 013fc04..c37049f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -27,6 +27,7 @@ import javax.management.ObjectName;
 import javax.management.openmbean.OpenDataException;
 import javax.management.openmbean.TabularData;
 
+import org.apache.commons.lang3.StringUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -581,7 +582,7 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 
 if (!anticompactRanges.isEmpty())
-logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, String.join(", ", anticompactRanges));
+logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, StringUtils.join(anticompactRanges, ", "));
 
 if (!shouldAnticompact)
 {


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

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/trunk
Commit: 6bcc60ae4c440be1ba9f6c2b83f697ac2f2b3f3e
Parents: 847b843 6ce887e
Author: Mick Semb Wever 
Authored: Wed Jul 11 10:16:52 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:52 2018 +1000

--

--



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

[04/10] cassandra git commit: ninja fix to f8912ce – Stop SSTables being lost from compaction strategy after full repairs

2018-07-10 Thread mck

ninja fix to f8912ce â Stop SSTables being lost from compaction strategy 
after full repairs

 patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14423


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

Branch: refs/heads/trunk
Commit: 3482370df5672c9337a16a8a52baba53b70a4fe8
Parents: 9ff7824
Author: Mick Semb Wever 
Authored: Tue Jul 10 10:25:50 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:06 2018 +1000

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3482370d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 013fc04..c37049f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -27,6 +27,7 @@ import javax.management.ObjectName;
 import javax.management.openmbean.OpenDataException;
 import javax.management.openmbean.TabularData;
 
+import org.apache.commons.lang3.StringUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -581,7 +582,7 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 
 if (!anticompactRanges.isEmpty())
-logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, String.join(", ", anticompactRanges));
+logger.info("SSTable {} ({}) will be anticompacted on 
ranges: {}", sstable, sstableBounds, StringUtils.join(anticompactRanges, ", "));
 
 if (!shouldAnticompact)
 {


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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 4266 matches

Mail list logo