svn commit: r12682 - in /release/cassandra: 3.0.2/ 3.0.4/ 3.1.1/ 3.2.1/ 3.4/ debian/dists/30x/ debian/dists/30x/main/binary-amd64/ debian/dists/30x/main/binary-i386/ debian/dists/30x/main/source/ debi

[jake]

Author: jake
Date: Tue Mar  8 03:06:57 2016
New Revision: 12682

Log:
3.4 and 3.0.4

Added:
release/cassandra/3.0.4/
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz   (with props)
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc.md5
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc.sha1
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.md5
release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.sha1
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz   (with props)
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz.asc
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz.asc.md5
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz.asc.sha1
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz.md5
release/cassandra/3.0.4/apache-cassandra-3.0.4-src.tar.gz.sha1
release/cassandra/3.4/
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz   (with props)
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz.asc
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz.asc.md5
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz.asc.sha1
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz.md5
release/cassandra/3.4/apache-cassandra-3.4-bin.tar.gz.sha1
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz   (with props)
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz.asc
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz.asc.md5
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz.asc.sha1
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz.md5
release/cassandra/3.4/apache-cassandra-3.4-src.tar.gz.sha1

release/cassandra/debian/pool/main/c/cassandra/cassandra-tools_3.0.4_all.deb   
(with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra-tools_3.4_all.deb  
 (with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.0.4.diff.gz   
(with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.0.4.dsc
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.0.4.orig.tar.gz  
 (with props)

release/cassandra/debian/pool/main/c/cassandra/cassandra_3.0.4.orig.tar.gz.asc
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.0.4_all.deb   
(with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.4.diff.gz   
(with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.4.dsc
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.4.orig.tar.gz   
(with props)
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.4.orig.tar.gz.asc
release/cassandra/debian/pool/main/c/cassandra/cassandra_3.4_all.deb   
(with props)
Removed:
release/cassandra/3.0.2/
release/cassandra/3.1.1/
release/cassandra/3.2.1/
Modified:
release/cassandra/debian/dists/30x/InRelease
release/cassandra/debian/dists/30x/Release
release/cassandra/debian/dists/30x/Release.gpg
release/cassandra/debian/dists/30x/main/binary-amd64/Packages
release/cassandra/debian/dists/30x/main/binary-amd64/Packages.gz
release/cassandra/debian/dists/30x/main/binary-i386/Packages
release/cassandra/debian/dists/30x/main/binary-i386/Packages.gz
release/cassandra/debian/dists/30x/main/source/Sources.gz

Added: release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz
==
Binary file - no diff available.

Propchange: release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc
==
--- release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc (added)
+++ release/cassandra/3.0.4/apache-cassandra-3.0.4-bin.tar.gz.asc Tue Mar  8 
03:06:57 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJW1Kd8AAoJEHSdbuwDU7Esz00P/2yMAwk4PBNEPzdueditirCI
+M6T6fD1qLcll4tYgBUvoz157gs/kFSFjEL820t0HIk1s9PoMfpRNoeLHCLIpVdU4
+V0g23TAj/5Gz47FuVmfT/0GCeYsKPisljzczWXsNP1x62i0bTN7FGJUyI2YLSgOl
+pbCnPxgdV1gQ60KXb8kTbQyqmuAmgxNqlZG9Wi4F1+i/yJ6PBywKVfPyR0AL4Zvn
+3OWfJitgT1L62F+RD2SoFFvd0D726Ssinqg0BkN5s8EY8NCDl/378SuU/nP/EBtB
+iGr2Ul8NJJOqrqexh2OcQog2qh6zEv/gSZqXTL8uKaPPDzU6f0TmGQ8l8nDb9tQ5
+YXk3nUzZSEcRa/u5ZKRYOkq54x5xFkKzQ1lubL1KEEFM+l7w3zevWSAKz+i9UlF6
+a/nArv+VCjNnEBC2XgoQW7aFsYMLPOPaapYUnlegynyPOPqJdJz/IXjlbiz177SP
+TM1Ibt5bRfL/PMAH6GPn1KXmEZ9Vd+drHQ8en5WFuXCSbQUmzj66cVFsZR+RAlkZ
+idmucLtWgYlzrSad31hxpyt3D1y3uAsDcqVo7UnoOYxb2L0H/8EiaAkeckJM+8/P
+wXqKFQldU3RGhbvwBxI/D4ZsFdF46FW+OeXQ8YwcFzaGHYXtdQTSCBhqemuiYYz/
+MDHLdNnCh/8aJek6LZVj
+=pJ1G
+-END PGP SIGNATURE-

Added: 

svn commit: r12683 - in /release/cassandra/debian/dists/34x: ./ main/ main/binary-amd64/ main/binary-i386/ main/source/

[jake]

Author: jake
Date: Tue Mar  8 03:07:18 2016
New Revision: 12683

Log:
3.4 and 3.0.4

Added:
release/cassandra/debian/dists/34x/
release/cassandra/debian/dists/34x/InRelease
release/cassandra/debian/dists/34x/Release
release/cassandra/debian/dists/34x/Release.gpg
release/cassandra/debian/dists/34x/main/
release/cassandra/debian/dists/34x/main/binary-amd64/
release/cassandra/debian/dists/34x/main/binary-amd64/Packages
release/cassandra/debian/dists/34x/main/binary-amd64/Packages.gz   (with 
props)
release/cassandra/debian/dists/34x/main/binary-amd64/Release
release/cassandra/debian/dists/34x/main/binary-i386/
release/cassandra/debian/dists/34x/main/binary-i386/Packages
release/cassandra/debian/dists/34x/main/binary-i386/Packages.gz   (with 
props)
release/cassandra/debian/dists/34x/main/binary-i386/Release
release/cassandra/debian/dists/34x/main/source/
release/cassandra/debian/dists/34x/main/source/Release
release/cassandra/debian/dists/34x/main/source/Sources.gz   (with props)

Added: release/cassandra/debian/dists/34x/InRelease
==
--- release/cassandra/debian/dists/34x/InRelease (added)
+++ release/cassandra/debian/dists/34x/InRelease Tue Mar  8 03:07:18 2016
@@ -0,0 +1,57 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA1
+
+Origin: Unofficial Cassandra Packages
+Label: Unofficial Cassandra Packages
+Codename: 34x
+Date: Tue, 08 Mar 2016 02:58:56 UTC
+Architectures: i386 amd64
+Components: main
+Description: Cassandra APT Repository
+MD5Sum:
+ 18de52df04bdf89835f24660fafdc9b4 1492 main/binary-i386/Packages
+ 240974a83f334492e2cd1dac19b39783 696 main/binary-i386/Packages.gz
+ 3214ca2c0fb908da64d0c82cedf49fec 148 main/binary-i386/Release
+ 18de52df04bdf89835f24660fafdc9b4 1492 main/binary-amd64/Packages
+ 240974a83f334492e2cd1dac19b39783 696 main/binary-amd64/Packages.gz
+ 37f612d4cf34c75e4ee8424f6fa711ea 149 main/binary-amd64/Release
+ be750240e181c4989ec347f4dfd2714f 1395 main/source/Sources
+ 525225513ecca7f054e3c11d468bfecc 744 main/source/Sources.gz
+ 5aa47f19dcecef15ff3b353cf85bfb29 150 main/source/Release
+SHA1:
+ 05a6ff39b660fa28445ca8393fe5bb54022902a9 1492 main/binary-i386/Packages
+ 40d218722019a0291c0a3261d804101cf4eb2145 696 main/binary-i386/Packages.gz
+ f49b67a648ccf6c6e4f96e003f61b089df0f54ed 148 main/binary-i386/Release
+ 05a6ff39b660fa28445ca8393fe5bb54022902a9 1492 main/binary-amd64/Packages
+ 40d218722019a0291c0a3261d804101cf4eb2145 696 main/binary-amd64/Packages.gz
+ ea578b501d3ecec83c2200c2bcebf172fa3efe98 149 main/binary-amd64/Release
+ 75f7c0cbd20f4d233dc4d8dd86c45fa096ab3c29 1395 main/source/Sources
+ 33499bd275b065f3e7065eeaf84a7a3f106ec36a 744 main/source/Sources.gz
+ 268c44a9381bbfbe1ca79f1a6836b205ecb07f79 150 main/source/Release
+SHA256:
+ 82f1c86eb957f0cef36beb7de8040c9baf967cf02d09f501ee7e88e1c4ad3dbd 1492 
main/binary-i386/Packages
+ e4d39fec0819ebf08213eb66a2967280118f9dc37e2666f4039e08b768c67441 696 
main/binary-i386/Packages.gz
+ b9b8bd71a706df21065102d61b38de8513d0b796301e0b2df845e340347f06c7 148 
main/binary-i386/Release
+ 82f1c86eb957f0cef36beb7de8040c9baf967cf02d09f501ee7e88e1c4ad3dbd 1492 
main/binary-amd64/Packages
+ e4d39fec0819ebf08213eb66a2967280118f9dc37e2666f4039e08b768c67441 696 
main/binary-amd64/Packages.gz
+ b29a345c4907522e3b159abe8f5886fc7eb54bce9d0d6ecbaded5445c3fab4a2 149 
main/binary-amd64/Release
+ 1f6c2da7afa008f74a2e5d27e1f91e0f4892a04a16c1ffcd75dace9f9d6f2ec7 1395 
main/source/Sources
+ 9d9c5df2e50fd14e8b48addfa4c4c9cf3ba297de37f2d9f4abc89ba95b627b88 744 
main/source/Sources.gz
+ 88ec5d7fbffe60a98ac15a3e628afaad585c57275b6355481028d659d26bd30c 150 
main/source/Release
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAEBAgAGBQJW3j/yAAoJEHSdbuwDU7EsfM0QAKAYAYBD/A8MNEu1RmkOhR+W
+AFisMJjm2HiQhl0npYHe0luG0/e8l4NDipfnISwUPn0D0pOkIao/iElFAitRGTNy
+fJBzAD9zC52dt0FUjI4x/jW0zFNl09wEWcjR2w9twENQEqEQ/LTU1aoj4Yz8yk4h
+1z2NqoETe0M+j36K4ohELaPg70GgjWZf6I29PmsvOb6D7Pa2gJ9n3i8pMIRr4B8N
+7r2mrwMXbXJSVbxI2VcH9ATd9cP+Wy8kFWWcxsdL/0QhGOwoCycwDQe/jloz8Xzs
+o+3UFdU+vo3NAMkpUPPuLvxTw6IZnw3bfROfJRWFvJ6+bwidxUnzSDw+AgaSCjxk
+43EaDQ/OsYr+ipmj5HIHUv96CSDo+4WpFiHO9dOv1T48FVqwWsSKMnn7LC9hqc5W
+uND+eMY8PO7FsgM+B1Teu2/N+5CbfuTio0wQu5RI2Ez5Vf8bGyZzR9fc4F7/iXLq
+FsTaa0CiXRdrvZN9GqGuCVq1bySYO3SosV26qIWmWcTm/UI67n+htJX4JnkGHDcO
+c8fYgUnlmfC3tz2lDDhb4IqBnibMgop/uWE60P0JuawzLIVqoQrs7Qk5+kjmQvFK
+ahERzz6cb35bpbXfIvNel0i37YSsWF6+c+WfBsrg+FO3DCfilOvsFQjkL16kKJDD
+hBV5Z+e6qKJ7duRzzZ3z
+=yn9G
+-END PGP SIGNATURE-

Added: release/cassandra/debian/dists/34x/Release
==
--- release/cassandra/debian/dists/34x/Release (added)
+++ release/cassandra/debian/dists/34x/Release Tue Mar  8 03:07:18 2016
@@ -0,0 +1,37 @@
+Origin: Unofficial Cassandra Packages
+Label: Unofficial Cassandra Packages
+Codename: 34x
+Date: Tue, 08 Mar 2016 02:58:56 UTC
+Architectures: i386 amd64

[cassandra] Git Push Summary

[jake]

Repository: cassandra
Updated Tags:  refs/tags/3.0.4-tentative [deleted] 632859080

[cassandra] Git Push Summary

[jake]

Repository: cassandra
Updated Tags:  refs/tags/cassandra-3.0.4 [created] 866a7904d

[cassandra] Git Push Summary

[jake]

Repository: cassandra
Updated Tags:  refs/tags/3.4-tentative [deleted] 70649a8d6

[cassandra] Git Push Summary

[jake]

Repository: cassandra
Updated Tags:  refs/tags/cassandra-3.4 [created] fd952750f

[jira] [Updated] (CASSANDRA-11086) trunk eclipse-warnings

[Jason Brown (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11086?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jason Brown updated CASSANDRA-11086:

   Resolution: Fixed
Fix Version/s: (was: 3.x)
   3.6
   Status: Resolved  (was: Ready to Commit)

committed to trunk (3.6) as sha 733d1ee6427cef1042f6c2f864caef81c1a5d32f

> trunk eclipse-warnings
> --
>
> Key: CASSANDRA-11086
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11086
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Michael Shuler
>Assignee: Jason Brown
>Priority: Minor
> Fix For: 3.6
>
>
> REF = origin/trunk 
> COMMIT = 7230a66318ce8add742959d095900d5870689f0c
> {noformat}
> # 1/27/16 8:50:25 PM UTC
> # Eclipse Compiler for Java(TM) v20150120-1634, 3.10.2, Copyright IBM Corp 
> 2000, 2013. All rights reserved.
> --
> 1. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/metrics/TableMetrics.java
>  (at line 338)
>   return 
> computeCompressionRatio(Iterables.concat(Iterables.transform(Keyspace.all(),
>  ^^^
> The method computeCompressionRatio(Iterable) in the type 
> TableMetrics is not applicable for the arguments (Iterable)
> --
> --
> 2. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
>  (at line 141)
>   return channel.socket();
>   
> Potential resource leak: 'channel' may not be closed at this location
> --
> --
> 3. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
>  (at line 93)
>   return cast(dup);
>   ^
> Potential resource leak: 'dup' may not be closed at this location
> --
> --
> 4. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 142)
>   indexFile = new MappedBuffer(new ChannelProxy(indexPath, 
> backingFile.getChannel()));
>
> ^
> Potential resource leak: '' may not be closed
> --
> 5. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 161)
>   throw new FSReadError(e, index);
>   
> Potential resource leak: 'backingFile' may not be closed at this location
> --
> 6. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 249)
>   RangeIterator range = searchRange(e);
>  ^
> Potential resource leak: 'range' may not be closed
> --
> --
> 7. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java
>  (at line 286)
>   throw new FSWriteError(e, file);
>   
> Potential resource leak: 'out' may not be closed at this location
> --
> --
> 8. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 284)
>   OnDiskIndex last = scheduleSegmentFlush(false).call();
>   
> Potential resource leak: 'last' may not be closed
> --
> 9. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 293)
>   OnDiskIndex part = Futures.getUnchecked(f);
>   
> Potential resource leak: 'part' may not be closed
> --
> --
> 10. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 118)
>   RangeIterator keyIterator = index.search(e);
>  ^^^
> Potential resource leak: 'keyIterator' may not be closed
> --
> 11. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 148)
>   return ranges == null ? null : new TermIterator(e, ranges, 
> referencedIndexes);
>   
> ^^
> Potential resource leak: 'ranges' may not be closed at this location
> --
> 12. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  

cassandra git commit: trunk eclipse-warnings

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk ab793c7f3 -> 733d1ee64


trunk eclipse-warnings

patch by jasobrown, reviewed by blerer for CASSANDRA-11086


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

Branch: refs/heads/trunk
Commit: 733d1ee6427cef1042f6c2f864caef81c1a5d32f
Parents: ab793c7
Author: Jason Brown 
Authored: Wed Mar 2 06:51:52 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 16:12:32 2016 -0800

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/index/sasi/TermIterator.java | 1 +
 src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java | 1 +
 src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java | 2 ++
 .../org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java   | 1 +
 .../apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java| 2 ++
 src/java/org/apache/cassandra/index/sasi/plan/Operation.java   | 1 +
 src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java   | 1 +
 .../apache/cassandra/index/sasi/utils/CombinedTermIterator.java| 1 +
 .../cassandra/index/sasi/utils/RangeIntersectionIterator.java  | 1 +
 .../org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java  | 1 +
 11 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cd9d8d9..b4ce53d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * Resolve some eclipse-warnings (CASSANDRA-11086)
  * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
  * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/TermIterator.java
--
diff --git a/src/java/org/apache/cassandra/index/sasi/TermIterator.java 
b/src/java/org/apache/cassandra/index/sasi/TermIterator.java
index cfa87c0..d2db88c 100644
--- a/src/java/org/apache/cassandra/index/sasi/TermIterator.java
+++ b/src/java/org/apache/cassandra/index/sasi/TermIterator.java
@@ -79,6 +79,7 @@ public class TermIterator extends RangeIterator
 this.referencedIndexes = referencedIndexes;
 }
 
+@SuppressWarnings("resource")
 public static TermIterator build(final Expression e, Set 
perSSTableIndexes)
 {
 final List> tokens = new 
CopyOnWriteArrayList<>();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
--
diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java 
b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
index 32cda53..e335b50 100644
--- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
+++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
@@ -81,6 +81,7 @@ public abstract class OnDiskBlock
 return new SearchResult<>(element, cmp, middle);
 }
 
+@SuppressWarnings("resource")
 protected T getTerm(int index)
 {
 MappedBuffer dup = blockIndex.duplicate();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
--
diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java 
b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
index a84e8bf..ef487f1 100644
--- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
+++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
@@ -114,6 +114,7 @@ public class OnDiskIndex implements 
Iterable, Closeable
 
 protected final ByteBuffer minTerm, maxTerm, minKey, maxKey;
 
+@SuppressWarnings("resource")
 public OnDiskIndex(File index, AbstractType cmp, Function keyReader)
 {
 keyFetcher = keyReader;
@@ -256,6 +257,7 @@ public class OnDiskIndex implements 
Iterable, Closeable
 RangeUnionIterator.Builder builder = 
RangeUnionIterator.builder();
 for (Expression e : ranges)
 {
+@SuppressWarnings("resource")
 RangeIterator range = searchRange(e);
 if (range != null)
 builder.add(range);

[jira] [Commented] (CASSANDRA-11182) Enable SASI index for collections

[Henry Manasseh (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11182?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15184037#comment-15184037
 ] 

Henry Manasseh commented on CASSANDRA-11182:


How would UDTs be handled with this feature?

Will you be supporting indexing UDT fields for collections of UDTs? I just saw 
that there is a ticket to allow individual updates to UDT fields 
(CASSANDRA-7423) which may facilitate getting the field as a Cell.


> Enable SASI index for collections
> -
>
> Key: CASSANDRA-11182
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11182
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: DOAN DuyHai
>Priority: Minor
>
> This is a follow up ticket for post Cassandra 3.4 SASI integration.
> Right now it is possible with standard Cassandra 2nd index to:
> 1. index list and set elements ( {{WHERE list CONTAINS xxx}})
> 2. index map keys ( {{WHERE map CONTAINS KEYS 'abc' }} )
> 3. index map entries ( {{WHERE map\['key'\]=value}})
>  It would be nice to enable these features in SASI too.
>  With regard to tokenizing, we might want to allow wildcards ({{%}}) with the 
> CONTAINS syntax as well as with index map entries. Ex:
> * {{WHERE list CONTAINS 'John%'}}
> * {{WHERE map CONTAINS KEY '%an%'}}
> * {{WHERE map\['key'\] LIKE '%val%'}}
> /cc [~xedin] [~rustyrazorblade] [~jkrupan]



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Assigned] (CASSANDRA-11059) In cqlsh show static columns in a different color

[Brandon Williams (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11059?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brandon Williams reassigned CASSANDRA-11059:


Assignee: Pavel Trukhanov

> In cqlsh show static columns in a different color
> -
>
> Key: CASSANDRA-11059
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11059
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: [cqlsh 5.0.1 | Cassandra 2.2.3 | CQL spec 3.3.1 | Native 
> protocol v4]
>Reporter: Cédric Hernalsteens
>Assignee: Pavel Trukhanov
>Priority: Minor
> Fix For: 3.6
>
>
> The partition key columns are shown in red, the clustering columns in cyan, 
> it would be great to also distinguish between the static columns and the 
> other.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11059) In cqlsh show static columns in a different color

[Yuki Morishita (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11059?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Yuki Morishita updated CASSANDRA-11059:
---
   Resolution: Fixed
Fix Version/s: (was: 3.x)
   3.6
   Status: Resolved  (was: Patch Available)

[~pavel.trukhanov] yes, basically, only bug fixes go to older version.

And patch looks good to me, test seems not broken by patch, so +1 and 
committed([ab793c7f3bdc17a8de584d0910aa9f5c4978dfa0|https://github.com/apache/cassandra/commit/ab793c7f3bdc17a8de584d0910aa9f5c4978dfa0]).

Thanks!

||branch||dtest||
|[11059|https://github.com/yukim/cassandra/tree/11059]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-11059-dtest/lastCompletedBuild/testReport/]|



> In cqlsh show static columns in a different color
> -
>
> Key: CASSANDRA-11059
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11059
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: [cqlsh 5.0.1 | Cassandra 2.2.3 | CQL spec 3.3.1 | Native 
> protocol v4]
>Reporter: Cédric Hernalsteens
>Priority: Minor
> Fix For: 3.6
>
>
> The partition key columns are shown in red, the clustering columns in cyan, 
> it would be great to also distinguish between the static columns and the 
> other.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

cassandra git commit: (cqlsh) Show static columns in a different color

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 615d0e155 -> ab793c7f3


(cqlsh) Show static columns in a different color

patch by Pavel Trukhanov; reviewed by yukim for CASSANDRA-11059


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

Branch: refs/heads/trunk
Commit: ab793c7f3bdc17a8de584d0910aa9f5c4978dfa0
Parents: 615d0e1
Author: Pavel Trukhanov 
Authored: Thu Mar 3 14:58:35 2016 +0300
Committer: Yuki Morishita 
Committed: Mon Mar 7 16:15:42 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab793c7f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 03891f3..cd9d8d9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
  * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab793c7f/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 78fedeb..71a5fcb 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -169,7 +169,7 @@ if os.path.isdir(cqlshlibdir):
 from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
 from cqlshlib.copyutil import ExportTask, ImportTask
 from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
- RED, FormattedValue, colorme)
+ RED, WHITE, FormattedValue, colorme)
 from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
  DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat,
  format_by_type, format_value_utype,
@@ -841,6 +841,8 @@ class Shell(cmd.Cmd):
 column_colors.default_factory = lambda: RED
 elif name in [col.name for col in table_meta.clustering_key]:
 column_colors.default_factory = lambda: CYAN
+elif name in table_meta.columns and 
table_meta.columns[name].is_static:
+column_colors.default_factory = lambda: WHITE
 return self.myformat_value(name, colormap=column_colors)
 
 def report_connection(self):

[jira] [Commented] (CASSANDRA-10120) When specifying both num_tokens and initial_token, error out if the numbers don't match

[Paulo Motta (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-10120?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183672#comment-15183672
 ] 

Paulo Motta commented on CASSANDRA-10120:
-

I just ran into a minor issue on a dtest that would be easily spottable if this 
check was in place. For example, I go this ugly exception in order to find out 
that {{num_tokens=256}} and {{initial_token=custom_token}} (facepalm):
{noformat}
ERROR [MemtableFlushWriter:1] 2016-03-07 17:41:14,342 CassandraDaemon.java:195 
- Exception in thread Thread[MemtableFlushWriter:1,5,main]
java.lang.IndexOutOfBoundsException: Index: 1, Size: 1
at java.util.ArrayList.rangeCheck(ArrayList.java:653) ~[na:1.8.0_66]
at java.util.ArrayList.get(ArrayList.java:429) ~[na:1.8.0_66]
at 
org.apache.cassandra.dht.Splitter.splitOwnedRangesNoPartialRanges(Splitter.java:99)
 ~[main/:na]
at org.apache.cassandra.dht.Splitter.splitOwnedRanges(Splitter.java:65) 
~[main/:na]
at 
org.apache.cassandra.service.StorageService.getDiskBoundaries(StorageService.java:4751)
 ~[main/:na]
at 
org.apache.cassandra.db.Memtable.createFlushRunnables(Memtable.java:273) 
~[main/:na]
at org.apache.cassandra.db.Memtable.flushRunnables(Memtable.java:265) 
~[main/:na]
at 
org.apache.cassandra.db.ColumnFamilyStore$Flush.run(ColumnFamilyStore.java:1061)
 ~[main/:na]
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) 
~[na:1.8.0_66]
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) 
~[na:1.8.0_66]
at java.lang.Thread.run(Thread.java:745) ~[na:1.8.0_66]
{noformat}

This is to say +1 to this check, which could have saved some minutes of my 
life. :)

> When specifying both num_tokens and initial_token, error out if the numbers 
> don't match
> ---
>
> Key: CASSANDRA-10120
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10120
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jeremy Hanna
>Assignee: Roman Pogribnyi
>Priority: Minor
>  Labels: lhf
> Fix For: 3.x
>
> Attachments: 10120-3.0.txt
>
>
> Right now if both initial_token and num_tokens are specified, initial_token 
> is used.  As something to not trip people up, it would be nice to do a basic 
> error check.  If both are specified, we should make sure they match.  That 
> is, if they have one initial token and num_tokens of 256, it should error out 
> on startup and alert the user of the configuration.  It's better to fail fast 
> than bootstrap with only one token.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-10167) fix resumable_bootstrap_test dtest failures

[Yuki Morishita (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10167?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Yuki Morishita resolved CASSANDRA-10167.

Resolution: Duplicate

> fix resumable_bootstrap_test dtest failures
> ---
>
> Key: CASSANDRA-10167
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10167
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Yuki Morishita
>
> {{resumable_bootstrap_test}} fails periodically and I believe that's been 
> true for quite a while. This is related to CASSANDRA-9132 and CASSANDRA-9444. 
> the current failures look like this: 
> http://cassci.datastax.com/job/cassandra-2.2_dtest/228/testReport/junit/bootstrap_test/TestBootstrap/resumable_bootstrap_test/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-10668) bootstrap_test.TestBootstrap.resumable_bootstrap_test is failing

[Yuki Morishita (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10668?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Yuki Morishita resolved CASSANDRA-10668.

Resolution: Duplicate

> bootstrap_test.TestBootstrap.resumable_bootstrap_test is failing
> 
>
> Key: CASSANDRA-10668
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10668
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Sylvain Lebresne
>Assignee: Yuki Morishita
>  Labels: dtest
> Fix For: 3.0.x
>
>
> From the [test 
> history|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/bootstrap_test/TestBootstrap/resumable_bootstrap_test/history/],
>  it seems the test has been flappy for a while, but it's been constantly 
> failing for the last few builts.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-10912) resumable_bootstrap_test dtest flaps

[Yuki Morishita (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-10912?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183495#comment-15183495
 ] 

Yuki Morishita commented on CASSANDRA-10912:


This may be caused by CASSANDRA-11286.

> resumable_bootstrap_test dtest flaps
> 
>
> Key: CASSANDRA-10912
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10912
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Yuki Morishita
>  Labels: dtest
> Fix For: 3.0.x
>
>
> {{bootstrap_test.py:TestBootstrap.resumable_bootstrap_test}} test flaps when 
> a node fails to start listening for connections via CQL:
> {code}
> 21 Dec 2015 10:07:48 [node3] Missing: ['Starting listening for CQL clients']:
> {code}
> I've seen it on 2.2 HEAD:
> http://cassci.datastax.com/job/cassandra-2.2_dtest/449/testReport/bootstrap_test/TestBootstrap/resumable_bootstrap_test/history/
> and 3.0 HEAD:
> http://cassci.datastax.com/job/cassandra-3.0_dtest/444/testReport/junit/bootstrap_test/TestBootstrap/resumable_bootstrap_test/
> and trunk:
> http://cassci.datastax.com/job/trunk_dtest/838/testReport/junit/bootstrap_test/TestBootstrap/resumable_bootstrap_test/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11286) streaming socket never times out

[Yuki Morishita (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11286?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183491#comment-15183491
 ] 

Yuki Morishita commented on CASSANDRA-11286:


Thanks for the catch!
Patches look good, though for 2.2+, bootstrap_test dtest was failing on your 
results. (I ran on my machine and the test was success though).
Can you run dtests on 2.2+ again to make sure bootstrap_test is ok?

> streaming socket never times out
> 
>
> Key: CASSANDRA-11286
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11286
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
>Reporter: Paulo Motta
>Assignee: Paulo Motta
>
> While trying to reproduce CASSANDRA-8343 I was not able to trigger a 
> {{SocketTimeoutException}} by adding an artificial sleep longer than 
> {{streaming_socket_timeout_in_ms}}.
> After investigation, I detected two problems:
> * {{ReadableByteChannel}} creation via {{socket.getChannel()}}, as done in 
> {{ConnectionHandler.getReadChannel(socket)}}, does not respect 
> {{socket.setSoTimeout()}}, as explained in this [blog 
> post|https://technfun.wordpress.com/2009/01/29/networking-in-java-non-blocking-nio-blocking-nio-and-io/]
> ** bq. The only difference between “blocking NIO” and “NIO wrapped around IO” 
> is that you can’t use socket timeout with SocketChannels. Why ? Read a 
> javadoc for setSocketTimeout(). It says that this timeout is used only by 
> streams.
> * {{socketSoTimeout}} is never set on "follower" side, only on initiator side 
> via {{DefaultConnectionFactory.createConnection(peer)}}.
> This may cause streaming to hang indefinitely, as exemplified by 
> CASSANDRA-8621:
> bq. For the scenario that prompted this ticket, it appeared that the 
> streaming process was completely stalled. One side of the stream (the sender 
> side) had an exception that appeared to be a connection reset. The receiving 
> side appeared to think that the connection was still active, at least in 
> terms of the netstats reported by nodetool. We were unable to verify whether 
> this was specifically the case in terms of connected sockets due to the fact 
> that there were multiple streams for those peers, and there is no simple way 
> to correlate a specific stream to a tcp session.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11278) dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test and tracing_unknown_impl_test

[Russ Hatch (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11278?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183489#comment-15183489
 ] 

Russ Hatch commented on CASSANDRA-11278:


dtests adjusted for 3.4+

> dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test 
> and tracing_unknown_impl_test
> 
>
> Key: CASSANDRA-11278
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11278
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: Jim Witschey
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_novnode_dtest/174/testReport/cql_tracing_test/TestCqlTracing/tracing_default_impl_test
> Failed on CassCI build cassandra-3.0_novnode_dtest #174



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-11278) dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test and tracing_unknown_impl_test

[Russ Hatch (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11278?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Russ Hatch resolved CASSANDRA-11278.

Resolution: Fixed

> dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test 
> and tracing_unknown_impl_test
> 
>
> Key: CASSANDRA-11278
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11278
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: Jim Witschey
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_novnode_dtest/174/testReport/cql_tracing_test/TestCqlTracing/tracing_default_impl_test
> Failed on CassCI build cassandra-3.0_novnode_dtest #174



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11297) AssertionError in nodetool cfstats in 3.0 (Back port CASSANDRA-10859)

[Yuki Morishita (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11297?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Yuki Morishita updated CASSANDRA-11297:
---
   Resolution: Fixed
Fix Version/s: (was: 3.0.x)
   (was: 2.2.x)
   3.0.5
   2.2.6
   Status: Resolved  (was: Patch Available)

Thanks, committed to 2.2 and 3.0.

[6e0395e5a8cc7642128685d6d41248798e2e952b|https://github.com/apache/cassandra/commit/6e0395e5a8cc7642128685d6d41248798e2e952b]

> AssertionError in nodetool cfstats in 3.0 (Back port CASSANDRA-10859)
> -
>
> Key: CASSANDRA-11297
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11297
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Yuki Morishita
> Fix For: 2.2.6, 3.0.5
>
>
> Looks like CASSANDRA-10859 is an issue in cassandra-2.2 and 3.0 as well, if 
> you add the -ea to the nodetool script in those you get the problem in those 
> as well.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[2/3] cassandra git commit: 11210 is fixed in 3.5

[yukim]

11210 is fixed in 3.5


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

Branch: refs/heads/trunk
Commit: c9e9b62ebc45344837d5692176ea97976c984074
Parents: eef2b18
Author: Yuki Morishita 
Authored: Mon Mar 7 12:52:04 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:52:04 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9e9b62e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9699bfd..c791139 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Merged from 3.0:
  * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
  * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Only log yaml config once, at startup (CASSANDRA-11217)
  * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 Merged from 2.1:
@@ -63,7 +64,6 @@ Merged from 3.0:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
- * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

[1/3] cassandra git commit: 11210 is fixed in 3.5

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.5 eef2b189c -> c9e9b62eb
  refs/heads/trunk 3ae4f80e4 -> 615d0e155


11210 is fixed in 3.5


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

Branch: refs/heads/cassandra-3.5
Commit: c9e9b62ebc45344837d5692176ea97976c984074
Parents: eef2b18
Author: Yuki Morishita 
Authored: Mon Mar 7 12:52:04 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:52:04 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9e9b62e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9699bfd..c791139 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Merged from 3.0:
  * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
  * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Only log yaml config once, at startup (CASSANDRA-11217)
  * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 Merged from 2.1:
@@ -63,7 +64,6 @@ Merged from 3.0:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
- * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

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

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 615d0e15551cbb7e8f5100b33723562c31876889
Parents: 3ae4f80 c9e9b62
Author: Yuki Morishita 
Authored: Mon Mar 7 12:52:29 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:52:29 2016 -0600

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


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

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 3ae4f80e4e7bb853b438bca014429d4962caad12
Parents: e017f94 eef2b18
Author: Yuki Morishita 
Authored: Mon Mar 7 12:48:26 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:48:26 2016 -0600

--

--

[09/15] cassandra git commit: Fix AssertionError in nodetool cfstats

[yukim]

Fix AssertionError in nodetool cfstats

Backport CASSANDRA-10859

patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-11297


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

Branch: refs/heads/trunk
Commit: 6e0395e5a8cc7642128685d6d41248798e2e952b
Parents: a956e9f
Author: Yuki Morishita 
Authored: Wed Mar 2 13:19:05 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:39:39 2016 -0600

--
 CHANGES.txt |  1 +
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 25 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a6d6a14..89fa904 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java 
b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index b152434..207a74e 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@ -66,14 +66,12 @@ public class TableHistograms extends NodeToolCmd
 }
 else
 {
-long[] rowSizeBucketOffsets = new 
EstimatedHistogram(estimatedRowSize.length).getBucketOffsets();
-long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
-EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(rowSizeBucketOffsets, estimatedRowSize);
-EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
+EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
+EstimatedHistogram columnCountHist = new 
EstimatedHistogram(estimatedColumnCount);
 
 if (rowSizeHist.isOverflowed())
 {
-System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", 
rowSizeBucketOffsets[rowSizeBucketOffsets.length - 1]));
+System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", rowSizeHist.getLargestBucketOffset()));
 for (int i = 0; i < offsetPercentiles.length; i++)
 estimatedRowSizePercentiles[i] = Double.NaN;
 }
@@ -85,7 +83,7 @@ public class TableHistograms extends NodeToolCmd
 
 if (columnCountHist.isOverflowed())
 {
-System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountBucketOffsets[columnCountBucketOffsets.length - 1]));
+System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountHist.getLargestBucketOffset()));
 for (int i = 0; i < estimatedColumnCountPercentiles.length; 
i++)
 estimatedColumnCountPercentiles[i] = Double.NaN;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
--
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java 
b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 6c929df..36048fb 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -66,6 +66,18 @@ public class EstimatedHistogram
 buckets = new AtomicLongArray(bucketOffsets.length + 1);
 }
 
+/**
+ * Create EstimatedHistogram from only bucket data.
+ *
+ * @param bucketData bucket data
+ */
+public EstimatedHistogram(long[] bucketData)
+{
+assert bucketData != null && bucketData.length > 0 : "Bucket data must 
be an array of size more than 0";
+bucketOffsets = 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.5
Commit: 34b07a74fbde87d2a671ace8bf10d32057817f9a
Parents: 1543290 6e0395e
Author: Yuki Morishita 
Authored: Mon Mar 7 12:45:55 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:45:55 2016 -0600

--
 CHANGES.txt |  2 ++
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 26 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/CHANGES.txt
--
diff --cc CHANGES.txt
index 4eef41f,89fa904..38bf2ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.6
 +3.0.5
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 +
 +
 +3.0.4
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * MV should only query complex columns included in the view (CASSANDRA-11069)
 + * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
 + * Add sstabledump tool (CASSANDRA-7464)
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 +Merged from 2.2:
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
   * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
   * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index 23f1c43,207a74e..be3f799
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@@ -66,14 -66,12 +66,12 @@@ public class TableHistograms extends No
  }
  else
  {
- long[] partitionSizeBucketOffsets = new 
EstimatedHistogram(estimatedPartitionSize.length).getBucketOffsets();
- long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
- EstimatedHistogram partitionSizeHist = new 
EstimatedHistogram(partitionSizeBucketOffsets, estimatedPartitionSize);
- EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
 -EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
++

[03/15] cassandra git commit: Unresolved hostname leads to replace being ignored

[yukim]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/trunk
Commit: 1543290f14ef73ee496532610fe027bb29060b29
Parents: 8e9622a
Author: Jason Brown 
Authored: Mon Mar 7 05:31:52 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:31:52 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7204098..4eef41f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@ Merged from 2.1:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
  * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7bcfb97..2c5e603 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -951,7 +951,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement ost name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[08/15] cassandra git commit: Fix AssertionError in nodetool cfstats

[yukim]

Fix AssertionError in nodetool cfstats

Backport CASSANDRA-10859

patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-11297


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

Branch: refs/heads/cassandra-2.2
Commit: 6e0395e5a8cc7642128685d6d41248798e2e952b
Parents: a956e9f
Author: Yuki Morishita 
Authored: Wed Mar 2 13:19:05 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:39:39 2016 -0600

--
 CHANGES.txt |  1 +
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 25 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a6d6a14..89fa904 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java 
b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index b152434..207a74e 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@ -66,14 +66,12 @@ public class TableHistograms extends NodeToolCmd
 }
 else
 {
-long[] rowSizeBucketOffsets = new 
EstimatedHistogram(estimatedRowSize.length).getBucketOffsets();
-long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
-EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(rowSizeBucketOffsets, estimatedRowSize);
-EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
+EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
+EstimatedHistogram columnCountHist = new 
EstimatedHistogram(estimatedColumnCount);
 
 if (rowSizeHist.isOverflowed())
 {
-System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", 
rowSizeBucketOffsets[rowSizeBucketOffsets.length - 1]));
+System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", rowSizeHist.getLargestBucketOffset()));
 for (int i = 0; i < offsetPercentiles.length; i++)
 estimatedRowSizePercentiles[i] = Double.NaN;
 }
@@ -85,7 +83,7 @@ public class TableHistograms extends NodeToolCmd
 
 if (columnCountHist.isOverflowed())
 {
-System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountBucketOffsets[columnCountBucketOffsets.length - 1]));
+System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountHist.getLargestBucketOffset()));
 for (int i = 0; i < estimatedColumnCountPercentiles.length; 
i++)
 estimatedColumnCountPercentiles[i] = Double.NaN;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
--
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java 
b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 6c929df..36048fb 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -66,6 +66,18 @@ public class EstimatedHistogram
 buckets = new AtomicLongArray(bucketOffsets.length + 1);
 }
 
+/**
+ * Create EstimatedHistogram from only bucket data.
+ *
+ * @param bucketData bucket data
+ */
+public EstimatedHistogram(long[] bucketData)
+{
+assert bucketData != null && bucketData.length > 0 : "Bucket data must 
be an array of size more than 0";
+

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 34b07a74fbde87d2a671ace8bf10d32057817f9a
Parents: 1543290 6e0395e
Author: Yuki Morishita 
Authored: Mon Mar 7 12:45:55 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:45:55 2016 -0600

--
 CHANGES.txt |  2 ++
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 26 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/CHANGES.txt
--
diff --cc CHANGES.txt
index 4eef41f,89fa904..38bf2ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.6
 +3.0.5
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 +
 +
 +3.0.4
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * MV should only query complex columns included in the view (CASSANDRA-11069)
 + * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
 + * Add sstabledump tool (CASSANDRA-7464)
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 +Merged from 2.2:
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
   * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
   * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index 23f1c43,207a74e..be3f799
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@@ -66,14 -66,12 +66,12 @@@ public class TableHistograms extends No
  }
  else
  {
- long[] partitionSizeBucketOffsets = new 
EstimatedHistogram(estimatedPartitionSize.length).getBucketOffsets();
- long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
- EstimatedHistogram partitionSizeHist = new 
EstimatedHistogram(partitionSizeBucketOffsets, estimatedPartitionSize);
- EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
 -EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
++

[05/15] cassandra git commit: Unresolved hostname leads to replace being ignored

[yukim]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/trunk
Commit: ad8673cc6b021e9dac188cfc3ec18ea6f9c0bfdc
Parents: 66fa1d4
Author: Jason Brown 
Authored: Mon Mar 7 05:34:24 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:34:24 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 34b07a74fbde87d2a671ace8bf10d32057817f9a
Parents: 1543290 6e0395e
Author: Yuki Morishita 
Authored: Mon Mar 7 12:45:55 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:45:55 2016 -0600

--
 CHANGES.txt |  2 ++
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 26 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/CHANGES.txt
--
diff --cc CHANGES.txt
index 4eef41f,89fa904..38bf2ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.6
 +3.0.5
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 +
 +
 +3.0.4
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * MV should only query complex columns included in the view (CASSANDRA-11069)
 + * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
 + * Add sstabledump tool (CASSANDRA-7464)
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 +Merged from 2.2:
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
   * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
   * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index 23f1c43,207a74e..be3f799
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@@ -66,14 -66,12 +66,12 @@@ public class TableHistograms extends No
  }
  else
  {
- long[] partitionSizeBucketOffsets = new 
EstimatedHistogram(estimatedPartitionSize.length).getBucketOffsets();
- long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
- EstimatedHistogram partitionSizeHist = new 
EstimatedHistogram(partitionSizeBucketOffsets, estimatedPartitionSize);
- EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
 -EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
++EstimatedHistogram 

[02/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown 
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:29:23 2016 -0800

--

--

[01/15] cassandra git commit: Unresolved hostname leads to replace being ignored

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a956e9fe0 -> 6e0395e5a
  refs/heads/cassandra-3.0 1543290f1 -> 34b07a74f
  refs/heads/cassandra-3.5 ad8673cc6 -> eef2b189c
  refs/heads/trunk e017f9494 -> 3ae4f80e4


Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/trunk
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown 
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:27:58 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[07/15] cassandra git commit: Fix AssertionError in nodetool cfstats

[yukim]

Fix AssertionError in nodetool cfstats

Backport CASSANDRA-10859

patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-11297


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

Branch: refs/heads/cassandra-3.0
Commit: 6e0395e5a8cc7642128685d6d41248798e2e952b
Parents: a956e9f
Author: Yuki Morishita 
Authored: Wed Mar 2 13:19:05 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:39:39 2016 -0600

--
 CHANGES.txt |  1 +
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 25 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a6d6a14..89fa904 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java 
b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index b152434..207a74e 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@ -66,14 +66,12 @@ public class TableHistograms extends NodeToolCmd
 }
 else
 {
-long[] rowSizeBucketOffsets = new 
EstimatedHistogram(estimatedRowSize.length).getBucketOffsets();
-long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
-EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(rowSizeBucketOffsets, estimatedRowSize);
-EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
+EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
+EstimatedHistogram columnCountHist = new 
EstimatedHistogram(estimatedColumnCount);
 
 if (rowSizeHist.isOverflowed())
 {
-System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", 
rowSizeBucketOffsets[rowSizeBucketOffsets.length - 1]));
+System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", rowSizeHist.getLargestBucketOffset()));
 for (int i = 0; i < offsetPercentiles.length; i++)
 estimatedRowSizePercentiles[i] = Double.NaN;
 }
@@ -85,7 +83,7 @@ public class TableHistograms extends NodeToolCmd
 
 if (columnCountHist.isOverflowed())
 {
-System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountBucketOffsets[columnCountBucketOffsets.length - 1]));
+System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountHist.getLargestBucketOffset()));
 for (int i = 0; i < estimatedColumnCountPercentiles.length; 
i++)
 estimatedColumnCountPercentiles[i] = Double.NaN;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
--
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java 
b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 6c929df..36048fb 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -66,6 +66,18 @@ public class EstimatedHistogram
 buckets = new AtomicLongArray(bucketOffsets.length + 1);
 }
 
+/**
+ * Create EstimatedHistogram from only bucket data.
+ *
+ * @param bucketData bucket data
+ */
+public EstimatedHistogram(long[] bucketData)
+{
+assert bucketData != null && bucketData.length > 0 : "Bucket data must 
be an array of size more than 0";
+

[04/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/trunk
Commit: 66fa1d492c5875b02a9c864c6c9e47093d2c5c2c
Parents: 8c83c8e 1543290
Author: Jason Brown 
Authored: Mon Mar 7 05:32:51 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:32:51 2016 -0800

--

--

[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/trunk
Commit: eef2b189c0c17213508276237c226bfcd273b0ca
Parents: ad8673c 34b07a7
Author: Yuki Morishita 
Authored: Mon Mar 7 12:47:14 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:47:14 2016 -0600

--

--

[06/15] cassandra git commit: Fix AssertionError in nodetool cfstats

[yukim]

Fix AssertionError in nodetool cfstats

Backport CASSANDRA-10859

patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-11297


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

Branch: refs/heads/cassandra-3.5
Commit: 6e0395e5a8cc7642128685d6d41248798e2e952b
Parents: a956e9f
Author: Yuki Morishita 
Authored: Wed Mar 2 13:19:05 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:39:39 2016 -0600

--
 CHANGES.txt |  1 +
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 25 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a6d6a14..89fa904 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java 
b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index b152434..207a74e 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@ -66,14 +66,12 @@ public class TableHistograms extends NodeToolCmd
 }
 else
 {
-long[] rowSizeBucketOffsets = new 
EstimatedHistogram(estimatedRowSize.length).getBucketOffsets();
-long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
-EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(rowSizeBucketOffsets, estimatedRowSize);
-EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
+EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
+EstimatedHistogram columnCountHist = new 
EstimatedHistogram(estimatedColumnCount);
 
 if (rowSizeHist.isOverflowed())
 {
-System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", 
rowSizeBucketOffsets[rowSizeBucketOffsets.length - 1]));
+System.err.println(String.format("Row sizes are larger than 
%s, unable to calculate percentiles", rowSizeHist.getLargestBucketOffset()));
 for (int i = 0; i < offsetPercentiles.length; i++)
 estimatedRowSizePercentiles[i] = Double.NaN;
 }
@@ -85,7 +83,7 @@ public class TableHistograms extends NodeToolCmd
 
 if (columnCountHist.isOverflowed())
 {
-System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountBucketOffsets[columnCountBucketOffsets.length - 1]));
+System.err.println(String.format("Column counts are larger 
than %s, unable to calculate percentiles", 
columnCountHist.getLargestBucketOffset()));
 for (int i = 0; i < estimatedColumnCountPercentiles.length; 
i++)
 estimatedColumnCountPercentiles[i] = Double.NaN;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0395e5/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
--
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java 
b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 6c929df..36048fb 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -66,6 +66,18 @@ public class EstimatedHistogram
 buckets = new AtomicLongArray(bucketOffsets.length + 1);
 }
 
+/**
+ * Create EstimatedHistogram from only bucket data.
+ *
+ * @param bucketData bucket data
+ */
+public EstimatedHistogram(long[] bucketData)
+{
+assert bucketData != null && bucketData.length > 0 : "Bucket data must 
be an array of size more than 0";
+

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: eef2b189c0c17213508276237c226bfcd273b0ca
Parents: ad8673c 34b07a7
Author: Yuki Morishita 
Authored: Mon Mar 7 12:47:14 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:47:14 2016 -0600

--

--

[jira] [Updated] (CASSANDRA-11312) DatabaseDescriptor#applyConfig should log stacktrace in case of Eception during seed provider creation

[Andrzej Ludwikowski (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11312?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andrzej Ludwikowski updated CASSANDRA-11312:

Attachment: 11312-2.2.txt

Proper patch for changing the flag.

> DatabaseDescriptor#applyConfig should log stacktrace in case of Eception 
> during seed provider creation
> --
>
> Key: CASSANDRA-11312
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11312
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Andrzej Ludwikowski
>Priority: Minor
> Attachments: 11312-2.2.txt
>
>
> The comment says that: "See log for stacktrace.", but with the the flag 
> "false" stacktrace is not logged. Logging stacktrace will save some time when 
> someone (like me) mess up with the configuration.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11312) DatabaseDescriptor#applyConfig should log stacktrace in case of Eception during seed provider creation

[Andrzej Ludwikowski (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11312?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andrzej Ludwikowski updated CASSANDRA-11312:

Attachment: (was: 11312-2.2.txt)

> DatabaseDescriptor#applyConfig should log stacktrace in case of Eception 
> during seed provider creation
> --
>
> Key: CASSANDRA-11312
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11312
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Andrzej Ludwikowski
>Priority: Minor
>
> The comment says that: "See log for stacktrace.", but with the the flag 
> "false" stacktrace is not logged. Logging stacktrace will save some time when 
> someone (like me) mess up with the configuration.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11168) Hint Metrics are updated even if hinted_hand-offs=false

[Joel Knighton (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11168?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183387#comment-15183387
 ] 

Joel Knighton commented on CASSANDRA-11168:
---

Yes, this accomplishes the desired behavior with regard to the metric.

It isn't clear to me why the changes to the scope of the if from the original 
code are needed. Is there a change in logical behavior or is it just a 
suggested code style change?

I think a patch that simply removes the metric increment in the case of early 
returns due to hinted handoff being disabled would be sufficient.

> Hint Metrics are updated even if hinted_hand-offs=false
> ---
>
> Key: CASSANDRA-11168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11168
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Anubhav Kale
>Assignee: Anubhav Kale
>Priority: Minor
> Attachments: 0001-Hinted-Handoff-Fix.patch
>
>
> In our PROD logs, we noticed a lot of hint metrics even though we have 
> disabled hinted handoffs.
> The reason is StorageProxy.ShouldHint has an inverted if condition. 
> We should also wrap the if (hintWindowExpired) block in if 
> (DatabaseDescriptor.hintedHandoffEnabled()).
> The fix is easy, and I can provide a patch.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11313) cassandra.in.sh sigar path isn't used.

[Jeremiah Jordan (JIRA)]

Jeremiah Jordan created CASSANDRA-11313:
---

 Summary: cassandra.in.sh sigar path isn't used.
 Key: CASSANDRA-11313
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11313
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Jeremiah Jordan
Priority: Trivial
 Fix For: 2.2.x, 3.0.x, 3.x


cassandra.in.sh has:

{code}
# Added sigar-bin to the java.library.path CASSANDRA-7838
JAVA_OPTS="$JAVA_OPTS:-Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin"
{code}

At the end.  It is never used from there. If it was there would be an error 
because it does "$JAVA_OPTS:" not "$JAVA_OPTS "



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11312) DatabaseDescriptor#applyConfig should log stacktrace in case of Eception during seed provider creation

[Andrzej Ludwikowski (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11312?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andrzej Ludwikowski updated CASSANDRA-11312:

Attachment: 11312-2.2.txt

Patch for changing the flag.

> DatabaseDescriptor#applyConfig should log stacktrace in case of Eception 
> during seed provider creation
> --
>
> Key: CASSANDRA-11312
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11312
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Andrzej Ludwikowski
>Priority: Minor
> Attachments: 11312-2.2.txt
>
>
> The comment says that: "See log for stacktrace.", but with the the flag 
> "false" stacktrace is not logged. Logging stacktrace will save some time when 
> someone (like me) mess up with the configuration.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11092) EXPAND breaks when the result has 0 rows in cqlsh

[Yuki Morishita (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11092?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183365#comment-15183365
 ] 

Yuki Morishita commented on CASSANDRA-11092:


||branch||dtest||
|[11092-2.2|https://github.com/yukim/cassandra/tree/11092-2.2]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-11092-2.2-dtest/lastCompletedBuild/testReport/]|
|[11092-3.0|https://github.com/yukim/cassandra/tree/11092-3.0]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-11092-3.0-dtest/lastCompletedBuild/testReport/]|
|[11092-3.5|https://github.com/yukim/cassandra/tree/11092-3.5]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-11092-3.5-dtest/lastCompletedBuild/testReport/]|


> EXPAND breaks when the result has 0 rows in cqlsh
> -
>
> Key: CASSANDRA-11092
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11092
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Kishan Karunaratne
>Assignee: Yuki Morishita
>Priority: Trivial
>  Labels: cqlsh
> Fix For: 2.2.x, 3.0.x, 3.x
>
>
> {noformat}
> cqlsh> EXPAND ON;
> Now Expanded output is enabled
> cqlsh> select * from system.local;
> @ Row 1
> -+-
>  key | local
>  bootstrapped| COMPLETED
>  broadcast_address   | 127.0.0.1
>  cluster_name| dse_50_graph
>  cql_version | 3.4.0
>  data_center | Graph
>  dse_version | 5.0.0
>  gossip_generation   | 1454032824
>  graph   | True
>  host_id | ad30ccb2-04a1-4511-98b6-a72e4ea182c0
>  listen_address  | 127.0.0.1
>  native_protocol_version | 4
>  partitioner | org.apache.cassandra.dht.Murmur3Partitioner
>  rack| rack1
>  release_version | 3.0.1.816
>  rpc_address | 127.0.0.1
>  schema_version  | 5667501a-4ac3-3f00-ab35-9040efb927ad
>  server_id   | A0-CE-C8-01-CC-CA
>  thrift_version  | 20.1.0
>  tokens  | {'-9223372036854775808'}
>  truncated_at| null
>  workload| Cassandra
> (1 rows)
> cqlsh> select * from system.peers;
> max() arg is an empty sequence
> cqlsh> EXPAND OFF;
> Disabled Expanded output.
> cqlsh> select * from system.peers;
>  peer | data_center | dse_version | graph | host_id | preferred_ip | rack | 
> release_version | rpc_address | schema_version | server_id | tokens | workload
> --+-+-+---+-+--+--+-+-++---++--
> (0 rows)
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11312) DatabaseDescriptor#applyConfig should log stacktrace in case of Eception during seed provider creation

[Andrzej Ludwikowski (JIRA)]

Andrzej Ludwikowski created CASSANDRA-11312:
---

 Summary: DatabaseDescriptor#applyConfig should log stacktrace in 
case of Eception during seed provider creation
 Key: CASSANDRA-11312
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11312
 Project: Cassandra
  Issue Type: Improvement
  Components: Configuration
Reporter: Andrzej Ludwikowski
Priority: Minor


The comment says that: "See log for stacktrace.", but with the the flag "false" 
stacktrace is not logged. Logging stacktrace will save some time when someone 
(like me) mess up with the configuration.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11297) AssertionError in nodetool cfstats in 3.0 (Back port CASSANDRA-10859)

[Jeremiah Jordan (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11297?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183222#comment-15183222
 ] 

Jeremiah Jordan commented on CASSANDRA-11297:
-

+1

> AssertionError in nodetool cfstats in 3.0 (Back port CASSANDRA-10859)
> -
>
> Key: CASSANDRA-11297
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11297
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Yuki Morishita
> Fix For: 2.2.x, 3.0.x
>
>
> Looks like CASSANDRA-10859 is an issue in cassandra-2.2 and 3.0 as well, if 
> you add the -ea to the nodetool script in those you get the problem in those 
> as well.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-8928) Add downgradesstables

[Paulo Motta (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-8928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183144#comment-15183144
 ] 

Paulo Motta commented on CASSANDRA-8928:


[~kdmu] Nice start! You're in the right direction but I suggest focusing on 
downgrading from "ma" (3.x) to "la" (2.2) format first, since the new native 
storage format introduced on 3.0 is what will probably take the most of your 
time to understand and get right. In order to familiarize yourself with the 3.0 
storage format (which is brand new) I suggest you read [this blog 
post|http://thelastpickle.com/blog/2016/03/04/introductiont-to-the-apache-cassandra-3-storage-engine.html].
 For a more practical task you can you can do a similar breakdown of the 2.2 
format (if you can't find any available), what will make visualize better the 
main changes needed between these formats.

Also, another important goal of this ticket is to provide a generic framework 
that will allow to  downgrade sstables in future versions, so we should design 
it in a way that it can be reused to downgrade between different formats, 
rather than hard-coding to specific conversions. So before diving into hardcore 
implementation I suggest you to write a brief design document describing an 
overview of the downgrade process and its main interfaces and/or modules, so we 
can make sure we're on the same page before you start.

> Add downgradesstables
> -
>
> Key: CASSANDRA-8928
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8928
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Tools
>Reporter: Jeremy Hanna
>Priority: Minor
>  Labels: gsoc2016, mentor
>
> As mentioned in other places such as CASSANDRA-8047 and in the wild, 
> sometimes you need to go back.  A downgrade sstables utility would be nice 
> for a lot of reasons and I don't know that supporting going back to the 
> previous major version format would be too much code since we already support 
> reading the previous version.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11278) dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test and tracing_unknown_impl_test

[T Jake Luciani (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11278?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183142#comment-15183142
 ] 

T Jake Luciani commented on CASSANDRA-11278:


No CASSANDRA-10392 was only merged into 3.4

> dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test 
> and tracing_unknown_impl_test
> 
>
> Key: CASSANDRA-11278
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11278
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: Jim Witschey
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_novnode_dtest/174/testReport/cql_tracing_test/TestCqlTracing/tracing_default_impl_test
> Failed on CassCI build cassandra-3.0_novnode_dtest #174



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11278) dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test and tracing_unknown_impl_test

[Jim Witschey (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11278?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183139#comment-15183139
 ] 

Jim Witschey commented on CASSANDRA-11278:
--

I think a more complex {{@since}} is necessary -- if I understand correctly, 
the change was merged to 3.0.4 on the 3.0 track, and 3.4 on the tick-tock track.

Side note -- my mistake, I'm the one who forgot to add the decorators.

> dtest failure in cql_tracing_test.TestCqlTracing.tracing_default_impl_test 
> and tracing_unknown_impl_test
> 
>
> Key: CASSANDRA-11278
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11278
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: Jim Witschey
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_novnode_dtest/174/testReport/cql_tracing_test/TestCqlTracing/tracing_default_impl_test
> Failed on CassCI build cassandra-3.0_novnode_dtest #174



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-10331) Establish and implement canonical bulk reading workload(s)

[T Jake Luciani (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-10331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183136#comment-15183136
 ] 

T Jake Luciani commented on CASSANDRA-10331:


I like it!

Just so I understand. If I insert 100k items and set page size 1k I will do one 
loop around the tr in 100 iterations right (with 1 thread) with 100 threads all 
ranges will be split evenly?

How does split_factor relate to threads? Just allocates more splits for threads 
to work on at once?
If we wanted to simulate fetching all data uniquely ONLY once can we do that 
using -pop no-wrap seq=1..N where N is the insert count?  

In terms of code changes the only thing worth mentioning is you should add a 
check that the same label isn't used in queries AND token_range_queries.




> Establish and implement canonical bulk reading workload(s)
> --
>
> Key: CASSANDRA-10331
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10331
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Ariel Weisberg
>Assignee: Stefania
> Fix For: 3.x
>
>
> Implement a client, use stress, or extend stress to a bulk reading workload 
> that is indicative of the performance we are trying to improve.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11086) trunk eclipse-warnings

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11086?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-11086:
---
Status: Ready to Commit  (was: Patch Available)

> trunk eclipse-warnings
> --
>
> Key: CASSANDRA-11086
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11086
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Michael Shuler
>Assignee: Jason Brown
>Priority: Minor
> Fix For: 3.x
>
>
> REF = origin/trunk 
> COMMIT = 7230a66318ce8add742959d095900d5870689f0c
> {noformat}
> # 1/27/16 8:50:25 PM UTC
> # Eclipse Compiler for Java(TM) v20150120-1634, 3.10.2, Copyright IBM Corp 
> 2000, 2013. All rights reserved.
> --
> 1. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/metrics/TableMetrics.java
>  (at line 338)
>   return 
> computeCompressionRatio(Iterables.concat(Iterables.transform(Keyspace.all(),
>  ^^^
> The method computeCompressionRatio(Iterable) in the type 
> TableMetrics is not applicable for the arguments (Iterable)
> --
> --
> 2. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
>  (at line 141)
>   return channel.socket();
>   
> Potential resource leak: 'channel' may not be closed at this location
> --
> --
> 3. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
>  (at line 93)
>   return cast(dup);
>   ^
> Potential resource leak: 'dup' may not be closed at this location
> --
> --
> 4. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 142)
>   indexFile = new MappedBuffer(new ChannelProxy(indexPath, 
> backingFile.getChannel()));
>
> ^
> Potential resource leak: '' may not be closed
> --
> 5. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 161)
>   throw new FSReadError(e, index);
>   
> Potential resource leak: 'backingFile' may not be closed at this location
> --
> 6. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 249)
>   RangeIterator range = searchRange(e);
>  ^
> Potential resource leak: 'range' may not be closed
> --
> --
> 7. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java
>  (at line 286)
>   throw new FSWriteError(e, file);
>   
> Potential resource leak: 'out' may not be closed at this location
> --
> --
> 8. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 284)
>   OnDiskIndex last = scheduleSegmentFlush(false).call();
>   
> Potential resource leak: 'last' may not be closed
> --
> 9. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 293)
>   OnDiskIndex part = Futures.getUnchecked(f);
>   
> Potential resource leak: 'part' may not be closed
> --
> --
> 10. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 118)
>   RangeIterator keyIterator = index.search(e);
>  ^^^
> Potential resource leak: 'keyIterator' may not be closed
> --
> 11. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 148)
>   return ranges == null ? null : new TermIterator(e, ranges, 
> referencedIndexes);
>   
> ^^
> Potential resource leak: 'ranges' may not be closed at this location
> --
> 12. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 156)
>   throw ex;
>   ^
> Potential resource leak: 'memtableIterator' may not be closed at this location
> --
> 

[jira] [Commented] (CASSANDRA-11086) trunk eclipse-warnings

[Benjamin Lerer (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11086?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183070#comment-15183070
 ] 

Benjamin Lerer commented on CASSANDRA-11086:


+1

> trunk eclipse-warnings
> --
>
> Key: CASSANDRA-11086
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11086
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Michael Shuler
>Assignee: Jason Brown
>Priority: Minor
> Fix For: 3.x
>
>
> REF = origin/trunk 
> COMMIT = 7230a66318ce8add742959d095900d5870689f0c
> {noformat}
> # 1/27/16 8:50:25 PM UTC
> # Eclipse Compiler for Java(TM) v20150120-1634, 3.10.2, Copyright IBM Corp 
> 2000, 2013. All rights reserved.
> --
> 1. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/metrics/TableMetrics.java
>  (at line 338)
>   return 
> computeCompressionRatio(Iterables.concat(Iterables.transform(Keyspace.all(),
>  ^^^
> The method computeCompressionRatio(Iterable) in the type 
> TableMetrics is not applicable for the arguments (Iterable)
> --
> --
> 2. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
>  (at line 141)
>   return channel.socket();
>   
> Potential resource leak: 'channel' may not be closed at this location
> --
> --
> 3. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java
>  (at line 93)
>   return cast(dup);
>   ^
> Potential resource leak: 'dup' may not be closed at this location
> --
> --
> 4. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 142)
>   indexFile = new MappedBuffer(new ChannelProxy(indexPath, 
> backingFile.getChannel()));
>
> ^
> Potential resource leak: '' may not be closed
> --
> 5. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 161)
>   throw new FSReadError(e, index);
>   
> Potential resource leak: 'backingFile' may not be closed at this location
> --
> 6. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java
>  (at line 249)
>   RangeIterator range = searchRange(e);
>  ^
> Potential resource leak: 'range' may not be closed
> --
> --
> 7. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java
>  (at line 286)
>   throw new FSWriteError(e, file);
>   
> Potential resource leak: 'out' may not be closed at this location
> --
> --
> 8. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 284)
>   OnDiskIndex last = scheduleSegmentFlush(false).call();
>   
> Potential resource leak: 'last' may not be closed
> --
> 9. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
>  (at line 293)
>   OnDiskIndex part = Futures.getUnchecked(f);
>   
> Potential resource leak: 'part' may not be closed
> --
> --
> 10. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 118)
>   RangeIterator keyIterator = index.search(e);
>  ^^^
> Potential resource leak: 'keyIterator' may not be closed
> --
> 11. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 148)
>   return ranges == null ? null : new TermIterator(e, ranges, 
> referencedIndexes);
>   
> ^^
> Potential resource leak: 'ranges' may not be closed at this location
> --
> 12. ERROR in 
> /var/lib/jenkins/jobs/trunk_eclipse-warnings/workspace/src/java/org/apache/cassandra/index/sasi/TermIterator.java
>  (at line 156)
>   throw ex;
>   ^
> Potential resource leak: 'memtableIterator' may not be closed at this location
> --
> --
> 

[jira] [Updated] (CASSANDRA-11207) Can not remove TTL on table with default_time_to_live

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11207?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-11207:
---
   Resolution: Fixed
Fix Version/s: (was: 3.x)
   3.6
   Status: Resolved  (was: Ready to Commit)

Committed into trunk at e017f9494844234fa73848890347f59c622cea40.

> Can not remove TTL on table with default_time_to_live
> -
>
> Key: CASSANDRA-11207
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11207
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Matthieu Nantern
>Assignee: Benjamin Lerer
> Fix For: 3.6
>
> Attachments: 11207-trunk.txt
>
>
> I've created a table with a default TTL:
> {code:sql}
> CREATE TABLE testmna.ndr (
> device_id text,
> event_year text,
> event_time timestamp,
> active boolean,
> PRIMARY KEY ((device_id, event_year), event_time)
> ) WITH CLUSTERING ORDER BY (event_time DESC)
> AND bloom_filter_fp_chance = 0.01
> AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
> AND comment = ''
> AND compaction = {'class': 
> 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
> AND compression = {'sstable_compression': 
> 'org.apache.cassandra.io.compress.LZ4Compressor'}
> AND dclocal_read_repair_chance = 0.1
> AND default_time_to_live = 600
> AND gc_grace_seconds = 864000
> AND max_index_interval = 2048
> AND memtable_flush_period_in_ms = 0
> AND min_index_interval = 128
> AND read_repair_chance = 0.0
> AND speculative_retry = '99.0PERCENTILE';
> {code}
> When I insert data with a "runtime TTL" (INSERT ... USING TTL 86400) 
> everything works as expected (ttl is set to 86400).
> But I can't insert data without TTL at runtime: INSERT ... USING TTL 0; does 
> not work.
> Tested on C* 2.2.4, CentOS 7



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11207) Can not remove TTL on table with default_time_to_live

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11207?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-11207:
---
Attachment: 11207-trunk.txt

> Can not remove TTL on table with default_time_to_live
> -
>
> Key: CASSANDRA-11207
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11207
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Matthieu Nantern
>Assignee: Benjamin Lerer
> Fix For: 3.x
>
> Attachments: 11207-trunk.txt
>
>
> I've created a table with a default TTL:
> {code:sql}
> CREATE TABLE testmna.ndr (
> device_id text,
> event_year text,
> event_time timestamp,
> active boolean,
> PRIMARY KEY ((device_id, event_year), event_time)
> ) WITH CLUSTERING ORDER BY (event_time DESC)
> AND bloom_filter_fp_chance = 0.01
> AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
> AND comment = ''
> AND compaction = {'class': 
> 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
> AND compression = {'sstable_compression': 
> 'org.apache.cassandra.io.compress.LZ4Compressor'}
> AND dclocal_read_repair_chance = 0.1
> AND default_time_to_live = 600
> AND gc_grace_seconds = 864000
> AND max_index_interval = 2048
> AND memtable_flush_period_in_ms = 0
> AND min_index_interval = 128
> AND read_repair_chance = 0.0
> AND speculative_retry = '99.0PERCENTILE';
> {code}
> When I insert data with a "runtime TTL" (INSERT ... USING TTL 86400) 
> everything works as expected (ttl is set to 86400).
> But I can't insert data without TTL at runtime: INSERT ... USING TTL 0; does 
> not work.
> Tested on C* 2.2.4, CentOS 7



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

cassandra git commit: Allow to remove TTLs on table with default_time_to_live

[blerer]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 7d9989145 -> e017f9494


Allow to remove TTLs on table with default_time_to_live

patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11207


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

Branch: refs/heads/trunk
Commit: e017f9494844234fa73848890347f59c622cea40
Parents: 7d99891
Author: Benjamin Lerer 
Authored: Mon Mar 7 15:01:17 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Mar 7 15:01:17 2016 +0100

--
 CHANGES.txt |  4 ++
 NEWS.txt| 10 ++-
 doc/cql3/CQL.textile|  8 ++-
 .../org/apache/cassandra/cql3/Attributes.java   | 12 ++--
 .../apache/cassandra/cql3/UpdateParameters.java |  6 +-
 .../cql3/statements/ModificationStatement.java  |  2 +-
 .../org/apache/cassandra/db/LegacyLayout.java   |  2 +-
 .../org/apache/cassandra/db/LivenessInfo.java   | 14 ++--
 .../apache/cassandra/db/RowUpdateBuilder.java   |  4 +-
 .../apache/cassandra/db/rows/BufferCell.java| 11 +--
 .../cassandra/db/rows/UnfilteredSerializer.java |  2 +-
 src/java/org/apache/cassandra/db/view/View.java |  3 +-
 .../index/internal/CassandraIndex.java  |  4 +-
 .../cassandra/thrift/CassandraServer.java   | 21 --
 .../cassandra/thrift/ThriftValidation.java  |  4 +-
 .../cql3/validation/operations/InsertTest.java  | 31 +
 .../cql3/validation/operations/UpdateTest.java  | 31 +
 test/unit/org/apache/cassandra/db/CellTest.java | 12 ++--
 .../apache/cassandra/db/CounterCellTest.java|  8 +--
 test/unit/org/apache/cassandra/db/RowTest.java  |  2 +-
 .../partition/PartitionImplementationTest.java  |  4 +-
 .../rows/DigestBackwardCompatibilityTest.java   |  4 +-
 .../rows/RowAndDeletionMergeIteratorTest.java   |  6 +-
 .../org/apache/cassandra/db/rows/RowsTest.java  | 70 ++--
 .../rows/UnfilteredRowIteratorsMergeTest.java   |  2 +-
 .../index/internal/CustomCassandraIndex.java|  4 +-
 .../cassandra/index/sasi/SASIIndexTest.java |  4 +-
 .../sasi/disk/PerSSTableIndexWriterTest.java|  2 +-
 .../index/sasi/plan/OperationTest.java  |  2 +-
 .../format/SSTableFlushObserverTest.java| 18 ++---
 .../cassandra/service/DataResolverTest.java |  2 +-
 .../service/pager/PagingStateTest.java  |  2 +-
 .../cassandra/triggers/TriggerExecutorTest.java | 16 +++--
 33 files changed, 205 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e017f949/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9699bfd..015c952 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+3.6
+ * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
+
+
 3.5
 Merged from 3.0:
  * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e017f949/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index d554ac2..74490a8 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,8 +13,16 @@ restore snapshots created with the previous major version 
using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+3.6
+=
+
+New features
+
+   - for tables having a default_time_to_live specifying a TTL of 0 will 
remove the TTL
+ from the inserted or updated values.
+
 3.4
-===
+=
 
 New features
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e017f949/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 494a218..c942ec6 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1,6 +1,6 @@
 
 
-h1. Cassandra Query Language (CQL) v3.4.1
+h1. Cassandra Query Language (CQL) v3.4.2
 
 
 
@@ -911,7 +911,7 @@ h4(#updateOptions). @@
 
 The @UPDATE@ and @INSERT@ statements support the following options:
 * @TIMESTAMP@: sets the timestamp for the operation. If not specified, the 
coordinator will use the current time (in microseconds) at the start of 
statement execution as the timestamp. This is usually a suitable default.
-* @TTL@: specifies an optional Time To Live (in seconds) for the inserted 
values. If set, the inserted values are automatically removed from the database 
after the specified time. Note that the TTL concerns the inserted values, not 

[jira] [Updated] (CASSANDRA-10805) Additional Compaction Logging

[Marcus Eriksson (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10805?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Marcus Eriksson updated CASSANDRA-10805:

Fix Version/s: 3.x

> Additional Compaction Logging
> -
>
> Key: CASSANDRA-10805
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10805
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Compaction, Observability
>Reporter: Carl Yeksigian
>Assignee: Carl Yeksigian
>Priority: Minor
> Fix For: 3.x
>
>
> Currently, viewing the results of past compactions requires parsing the log 
> and looking at the compaction history system table, which doesn't have 
> information about, for example, flushed sstables not previously compacted.
> This is a proposal to extend the information captured for compaction. 
> Initially, this would be done through a JMX call, but if it proves to be 
> useful and not much overhead, it might be a feature that could be enabled for 
> the compaction strategy all the time.
> Initial log information would include:
> - The compaction strategy type controlling each column family
> - The set of sstables included in each compaction strategy
> - Information about flushes and compactions, including times and all involved 
> sstables
> - Information about sstables, including generation, size, and tokens
> - Any additional metadata the strategy wishes to add to a compaction or an 
> sstable, like the level of an sstable or the type of compaction being 
> performed



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-3486) Node Tool command to stop repair

[Jason Brown (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3486?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jason Brown updated CASSANDRA-3486:
---
Assignee: Paulo Motta  (was: Jason Brown)

> Node Tool command to stop repair
> 
>
> Key: CASSANDRA-3486
> URL: https://issues.apache.org/jira/browse/CASSANDRA-3486
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: JVM
>Reporter: Vijay
>Assignee: Paulo Motta
>Priority: Minor
>  Labels: repair
> Fix For: 2.1.x
>
> Attachments: 0001-stop-repair-3583.patch
>
>
> After CASSANDRA-1740, If the validation compaction is stopped then the repair 
> will hang. This ticket will allow users to kill the original repair.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-3486) Node Tool command to stop repair

[Jason Brown (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3486?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183007#comment-15183007
 ] 

Jason Brown commented on CASSANDRA-3486:


[~pauloricardomg] It's all yours ;) My first draft at this is so out of date 
that it's probably not worth the archaeological effort. And, yes, those were 
sort of nodetool commands I thought we'd need. 

IIRC, the tricky thing, two years ago when I worked on this, is you have to 
pass around the parent repair session id (which I don't think we did before) in 
order group all the child repairs due to vnodes (to kill all of those, too). I 
haven't been in the repair code in a while, so it might be different now.

> Node Tool command to stop repair
> 
>
> Key: CASSANDRA-3486
> URL: https://issues.apache.org/jira/browse/CASSANDRA-3486
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: JVM
>Reporter: Vijay
>Assignee: Jason Brown
>Priority: Minor
>  Labels: repair
> Fix For: 2.1.x
>
> Attachments: 0001-stop-repair-3583.patch
>
>
> After CASSANDRA-1740, If the validation compaction is stopped then the repair 
> will hang. This ticket will allow users to kill the original repair.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11210) Unresolved hostname in replace address

[Jason Brown (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11210?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jason Brown updated CASSANDRA-11210:

   Resolution: Fixed
Fix Version/s: 3.x
   3.5
   3.0.5
   Status: Resolved  (was: Ready to Commit)

committed to 2.2, 3.0, 3.5, and trunk. commit sha is 
a956e9fe0c1172241892d9e80cb23b12a19a8419

Thanks!

> Unresolved hostname in replace address
> --
>
> Key: CASSANDRA-11210
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11210
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: Jan Karlsson
>Priority: Minor
>  Labels: lhf
> Fix For: 2.2.6, 3.0.5, 3.5, 3.x
>
> Attachments: 
> 0001-Unresolved-hostname-leads-to-replace-being-ignored.patch
>
>
> If you provide a hostname which could not be resolved by DNS, it leads to 
> replace args being ignored. If you provide an IP which is not in the cluster, 
> it does the right thing and complain.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-11311) Delete of last row in the partition on table with static column returns row with nulls

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11311?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer resolved CASSANDRA-11311.

Resolution: Not A Problem

> Delete of last row in the partition on table with static column returns row 
> with nulls
> --
>
> Key: CASSANDRA-11311
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11311
> Project: Cassandra
>  Issue Type: Bug
> Environment: Cassandra 3.3
>Reporter: Michał Matłoka
>
> {code}
> create table static_delete_test (
>   id text,
>   clustering text,
> value int,
>   sthstatic text static,
>   PRIMARY KEY (id, clustering)
> );
> insert into static_delete_test(id, clustering, value, sthstatic) values ('a', 
>  'd', 1, 'statica');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('b', 
>  'd', 2, 'staticb');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('c', 
>  'd', 3, 'staticc');
> delete from static_delete_test where id = 'a' and clustering = 'd';
> select * from static_delete_test;
> {code}
> returns
> {code}
> a,null,statica,null
> c,d,staticc,3
> b,d,staticb,2
> {code}
> Problem occurs only when last row in the partition is deleted; Or is it a 
> feature?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[10/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/trunk
Commit: 7d998914506450fffdc70ed11c426c8e1ac1cd20
Parents: 6e69c75
Author: Jason Brown 
Authored: Mon Mar 7 05:36:04 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:36:04 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d998914/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d998914/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.5
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown 
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:29:23 2016 -0800

--

--

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown 
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:29:23 2016 -0800

--

--

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

[jasobrown]

Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: 66fa1d492c5875b02a9c864c6c9e47093d2c5c2c
Parents: 8c83c8e 1543290
Author: Jason Brown 
Authored: Mon Mar 7 05:32:51 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:32:51 2016 -0800

--

--

[06/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-3.5
Commit: 1543290f14ef73ee496532610fe027bb29060b29
Parents: 8e9622a
Author: Jason Brown 
Authored: Mon Mar 7 05:31:52 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:31:52 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7204098..4eef41f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@ Merged from 2.1:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
  * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7bcfb97..2c5e603 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -951,7 +951,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement ost name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[03/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-3.5
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown 
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:27:58 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[09/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-3.5
Commit: ad8673cc6b021e9dac188cfc3ec18ea6f9c0bfdc
Parents: 66fa1d4
Author: Jason Brown 
Authored: Mon Mar 7 05:34:24 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:34:24 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[07/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-3.0
Commit: 1543290f14ef73ee496532610fe027bb29060b29
Parents: 8e9622a
Author: Jason Brown 
Authored: Mon Mar 7 05:31:52 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:31:52 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7204098..4eef41f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@ Merged from 2.1:
properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
  * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7bcfb97..2c5e603 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -951,7 +951,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement ost name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[jira] [Commented] (CASSANDRA-11311) Delete of last row in the partition on table with static column returns row with nulls

[Benjamin Lerer (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11311?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15183001#comment-15183001
 ] 

Benjamin Lerer commented on CASSANDRA-11311:


This is the correct behavior (feature  :-)).
What you deleted is the rows from the partition not the static columns. Static 
columns are stored at the partition level not at the row level.



> Delete of last row in the partition on table with static column returns row 
> with nulls
> --
>
> Key: CASSANDRA-11311
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11311
> Project: Cassandra
>  Issue Type: Bug
> Environment: Cassandra 3.3
>Reporter: Michał Matłoka
>
> {code}
> create table static_delete_test (
>   id text,
>   clustering text,
> value int,
>   sthstatic text static,
>   PRIMARY KEY (id, clustering)
> );
> insert into static_delete_test(id, clustering, value, sthstatic) values ('a', 
>  'd', 1, 'statica');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('b', 
>  'd', 2, 'staticb');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('c', 
>  'd', 3, 'staticc');
> delete from static_delete_test where id = 'a' and clustering = 'd';
> select * from static_delete_test;
> {code}
> returns
> {code}
> a,null,statica,null
> c,d,staticc,3
> b,d,staticb,2
> {code}
> Problem occurs only when last row in the partition is deleted; Or is it a 
> feature?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[02/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-3.0
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown 
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:27:58 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[01/10] cassandra git commit: Unresolved hostname leads to replace being ignored

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 90fd8deed -> a956e9fe0
  refs/heads/cassandra-3.0 9c3855b5f -> 1543290f1
  refs/heads/cassandra-3.5 8c83c8eda -> ad8673cc6
  refs/heads/trunk 6e69c7590 -> 7d9989145


Unresolved hostname leads to replace being ignored

patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210


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

Branch: refs/heads/cassandra-2.2
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown 
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:27:58 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
 }
 catch (UnknownHostException e)
 {
-return null;
+throw new RuntimeException("Replacement host name could not be 
resolved or scope_id was specified for a global IPv6 address", e);
 }
 }
 

[jira] [Commented] (CASSANDRA-3486) Node Tool command to stop repair

[Paulo Motta (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3486?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182995#comment-15182995
 ] 

Paulo Motta commented on CASSANDRA-3486:


[~jasobrown] do you still plan to work on this? There is a lot of overlap 
between this and CASSANDRA-11190, which I'll start working on it soon, so I 
wanted to check if we could still reuse anything of your first draft or better 
start from scratch.

As to your previous questions, I think we can provide a way for users to 
stop/abort an ongoing local repair session given its session id. So, if session 
 is happening on nodes A, B and C, I can execute {{nodetool repair --abort 
}} on nodes A, B or C to abort session . I if execute {{nodetool repair 
--abort }} on node D, it will print something like {{No ongoing repair 
session found with id }}. For this to be useful, we should also provide a 
{{nodetool repair --list}} command to list ongoing repair sessions on the local 
node, and also {{nodetool repair --abort-all}} to abort all ongoing sessions on 
the local node.

> Node Tool command to stop repair
> 
>
> Key: CASSANDRA-3486
> URL: https://issues.apache.org/jira/browse/CASSANDRA-3486
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: JVM
>Reporter: Vijay
>Assignee: Jason Brown
>Priority: Minor
>  Labels: repair
> Fix For: 2.1.x
>
> Attachments: 0001-stop-repair-3583.patch
>
>
> After CASSANDRA-1740, If the validation compaction is stopped then the repair 
> will hang. This ticket will allow users to kill the original repair.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11210) Unresolved hostname in replace address

[Jason Brown (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11210?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182986#comment-15182986
 ] 

Jason Brown commented on CASSANDRA-11210:
-

I will commit this shortly

> Unresolved hostname in replace address
> --
>
> Key: CASSANDRA-11210
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11210
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: Jan Karlsson
>Priority: Minor
>  Labels: lhf
> Fix For: 2.2.6
>
> Attachments: 
> 0001-Unresolved-hostname-leads-to-replace-being-ignored.patch
>
>
> If you provide a hostname which could not be resolved by DNS, it leads to 
> replace args being ignored. If you provide an IP which is not in the cluster, 
> it does the right thing and complain.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-10805) Additional Compaction Logging

[Marcus Eriksson (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-10805?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182983#comment-15182983
 ] 

Marcus Eriksson commented on CASSANDRA-10805:
-

it looks good, a few comments;

* timestamps on all log entries
* it could perhaps be useful to log if the compaction strategy handles repaired 
or unrepaired data and which data directory it is handling instead of the 
strategy id? Or perhaps log the mapping on startup so we can figure it out?

and a nit - remove redundant "this." in CompactionLogger.

And an idea - feel free to ignore, could we make the serialization 'pluggable' 
in CompactionLogger? Then we could for example have all nodes in a cluster 
write to a socket somewhere so that we don't have to ship log files to 
visualize? We could do this in a followup ticket when/if anyone needs it though

> Additional Compaction Logging
> -
>
> Key: CASSANDRA-10805
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10805
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Compaction, Observability
>Reporter: Carl Yeksigian
>Assignee: Carl Yeksigian
>Priority: Minor
>
> Currently, viewing the results of past compactions requires parsing the log 
> and looking at the compaction history system table, which doesn't have 
> information about, for example, flushed sstables not previously compacted.
> This is a proposal to extend the information captured for compaction. 
> Initially, this would be done through a JMX call, but if it proves to be 
> useful and not much overhead, it might be a feature that could be enabled for 
> the compaction strategy all the time.
> Initial log information would include:
> - The compaction strategy type controlling each column family
> - The set of sstables included in each compaction strategy
> - Information about flushes and compactions, including times and all involved 
> sstables
> - Information about sstables, including generation, size, and tokens
> - Any additional metadata the strategy wishes to add to a compaction or an 
> sstable, like the level of an sstable or the type of compaction being 
> performed



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11310?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-11310:
---
  Labels: doc-impacting  (was: )
Reviewer: Benjamin Lerer

> Allow filtering on clustering columns for queries without secondary indexes
> ---
>
> Key: CASSANDRA-11310
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Benjamin Lerer
>Assignee: Alex Petrov
>  Labels: doc-impacting
> Fix For: 3.x
>
>
> Since CASSANDRA-6377 queries without index filtering non-primary key columns 
> are fully supported.
> It makes sense to also support filtering on clustering-columns.
> {code}
> CREATE TABLE emp_table2 (
> empID int,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> PRIMARY KEY (empID, b_yr, b_mon, b_day));
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
> WHERE b_mon='oct' ALLOW FILTERING;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-6377) ALLOW FILTERING should allow seq scan filtering

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-6377?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-6377:
--
Labels: cql doc-impacting  (was: cql)

> ALLOW FILTERING should allow seq scan filtering
> ---
>
> Key: CASSANDRA-6377
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6377
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Jonathan Ellis
>Assignee: Benjamin Lerer
>  Labels: cql, doc-impacting
> Fix For: 2.2.6, 3.5, 3.0.5
>
>
> CREATE TABLE emp_table2 (
> empID int PRIMARY KEY,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> );
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (100,'jane','doe','oct','31','1980');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (101,'john','smith','jan','01','1981');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (102,'mary','jones','apr','15','1982');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (103,'tim','best','oct','25','1982');
>
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2 
> WHERE b_mon='oct' ALLOW FILTERING;
> Bad Request: No indexed columns present in by-columns clause with Equal 
> operator



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Benjamin Lerer (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11310?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182948#comment-15182948
 ] 

Benjamin Lerer commented on CASSANDRA-11310:


:-)

A couple of hints:

I believe that the 2 main problems are the validation in 
{{StatementRestrictions::processClusteringColumnsRestrictions}} and the way the 
{{Clustering}} and {{Slice.Bound}} sets are build in 
{{PrimaryKeyRestrictionSet::valuesAsClustering}} and 
{{PrimaryKeyRestrictionSet::boundsAsClustering}} methods.

The unit test for filtering on non-primary key columns are located in 
{{SelectTest}} and the DTests for testing filtering with paging are in 
{{paging.py}}.

This change should also makes queries like: {{SELECT * FROM emp_table2 WHERE 
(b_yr, b_mon) > ('2015', 'oct') AND b_day ='01' ALLOW FILTERING}} fully valid. 
It will be great if you could also provide some test for that kind of query.

If you need some help do not hesitate to ping me. 

> Allow filtering on clustering columns for queries without secondary indexes
> ---
>
> Key: CASSANDRA-11310
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Benjamin Lerer
>Assignee: Alex Petrov
> Fix For: 3.x
>
>
> Since CASSANDRA-6377 queries without index filtering non-primary key columns 
> are fully supported.
> It makes sense to also support filtering on clustering-columns.
> {code}
> CREATE TABLE emp_table2 (
> empID int,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> PRIMARY KEY (empID, b_yr, b_mon, b_day));
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
> WHERE b_mon='oct' ALLOW FILTERING;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11311) Delete of last row in the partition on table with static column returns row with nulls

[JIRA]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11311?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michał Matłoka updated CASSANDRA-11311:
---
Description: 
{code}
create table static_delete_test (
id text,
clustering text,
value int,
sthstatic text static,
PRIMARY KEY (id, clustering)
);

insert into static_delete_test(id, clustering, value, sthstatic) values ('a',  
'd', 1, 'statica');
insert into static_delete_test(id, clustering, value, sthstatic) values ('b',  
'd', 2, 'staticb');
insert into static_delete_test(id, clustering, value, sthstatic) values ('c',  
'd', 3, 'staticc');

delete from static_delete_test where id = 'a' and clustering = 'd';
select * from static_delete_test;
{code}

returns
{code}
a,null,statica,null
c,d,staticc,3
b,d,staticb,2
{code}

Problem occurs only when last row in the partition is deleted; Or is it a 
feature?

  was:
{code}
create table static_delete_test (
id text,
clustering text,
value int,
sthstatic text static,
PRIMARY KEY (id, clustering)
);

insert into static_delete_test(id, clustering, value, sthstatic) values ('a',  
'd', 1, 'statica');
insert into static_delete_test(id, clustering, value, sthstatic) values ('b',  
'd', 2, 'staticb');
insert into static_delete_test(id, clustering, value, sthstatic) values ('c',  
'd', 3, 'staticc');

delete from static_delete_test where id = 'a' and clustering = 'd';
select * from static_delete_test;
{code}

returns
{code}
a,null,statica,null
c,d,staticc,3
b,d,staticb,2
{code}

Problem occurs only when last row in the partition is deleted;


> Delete of last row in the partition on table with static column returns row 
> with nulls
> --
>
> Key: CASSANDRA-11311
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11311
> Project: Cassandra
>  Issue Type: Bug
> Environment: Cassandra 3.3
>Reporter: Michał Matłoka
>
> {code}
> create table static_delete_test (
>   id text,
>   clustering text,
> value int,
>   sthstatic text static,
>   PRIMARY KEY (id, clustering)
> );
> insert into static_delete_test(id, clustering, value, sthstatic) values ('a', 
>  'd', 1, 'statica');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('b', 
>  'd', 2, 'staticb');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('c', 
>  'd', 3, 'staticc');
> delete from static_delete_test where id = 'a' and clustering = 'd';
> select * from static_delete_test;
> {code}
> returns
> {code}
> a,null,statica,null
> c,d,staticc,3
> b,d,staticb,2
> {code}
> Problem occurs only when last row in the partition is deleted; Or is it a 
> feature?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Benjamin Lerer (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11310?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Benjamin Lerer updated CASSANDRA-11310:
---
Assignee: Alex Petrov  (was: Benjamin Lerer)

> Allow filtering on clustering columns for queries without secondary indexes
> ---
>
> Key: CASSANDRA-11310
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Benjamin Lerer
>Assignee: Alex Petrov
> Fix For: 3.x
>
>
> Since CASSANDRA-6377 queries without index filtering non-primary key columns 
> are fully supported.
> It makes sense to also support filtering on clustering-columns.
> {code}
> CREATE TABLE emp_table2 (
> empID int,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> PRIMARY KEY (empID, b_yr, b_mon, b_day));
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
> WHERE b_mon='oct' ALLOW FILTERING;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11311) Delete of last row in the partition on table with static column returns row with nulls

[JIRA]

Michał Matłoka created CASSANDRA-11311:
--

 Summary: Delete of last row in the partition on table with static 
column returns row with nulls
 Key: CASSANDRA-11311
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11311
 Project: Cassandra
  Issue Type: Bug
 Environment: Cassandra 3.3
Reporter: Michał Matłoka


{code}
create table static_delete_test (
id text,
clustering text,
value int,
sthstatic text static,
PRIMARY KEY (id, clustering)
);

insert into static_delete_test(id, clustering, value, sthstatic) values ('a',  
'd', 1, 'statica');
insert into static_delete_test(id, clustering, value, sthstatic) values ('b',  
'd', 2, 'staticb');
insert into static_delete_test(id, clustering, value, sthstatic) values ('c',  
'd', 3, 'staticc');

delete from static_delete_test where id = 'a' and clustering = 'd';
select * from static_delete_test;
{code}

returns
{code}
a,null,statica,null
c,d,staticc,3
b,d,staticb,2
{code}

Problem occurs only when last row in the partition is deleted;



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11311) Delete of last row in the partition on table with static column returns row with nulls

[JIRA]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11311?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michał Matłoka updated CASSANDRA-11311:
---
Description: 
{code}
create table static_delete_test (
id text,
clustering text,
value int,
sthstatic text static,
PRIMARY KEY (id, clustering)
);

insert into static_delete_test(id, clustering, value, sthstatic) values ('a',  
'd', 1, 'statica');
insert into static_delete_test(id, clustering, value, sthstatic) values ('b',  
'd', 2, 'staticb');
insert into static_delete_test(id, clustering, value, sthstatic) values ('c',  
'd', 3, 'staticc');

delete from static_delete_test where id = 'a' and clustering = 'd';
select * from static_delete_test;
{code}

returns
{code}
a,null,statica,null
c,d,staticc,3
b,d,staticb,2
{code}

Problem occurs only when last row in the partition is deleted;

  was:
{code}
create table static_delete_test (
id text,
clustering text,
value int,
sthstatic text static,
PRIMARY KEY (id, clustering)
);

insert into static_delete_test(id, clustering, value, sthstatic) values ('a',  
'd', 1, 'statica');
insert into static_delete_test(id, clustering, value, sthstatic) values ('b',  
'd', 2, 'staticb');
insert into static_delete_test(id, clustering, value, sthstatic) values ('c',  
'd', 3, 'staticc');

delete from static_delete_test where id = 'a' and clustering = 'd';
select * from static_delete_test;
{code}

returns
{code}
a,null,statica,null
c,d,staticc,3
b,d,staticb,2
{code}

Problem occurs only when last row in the partition is deleted;


> Delete of last row in the partition on table with static column returns row 
> with nulls
> --
>
> Key: CASSANDRA-11311
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11311
> Project: Cassandra
>  Issue Type: Bug
> Environment: Cassandra 3.3
>Reporter: Michał Matłoka
>
> {code}
> create table static_delete_test (
>   id text,
>   clustering text,
> value int,
>   sthstatic text static,
>   PRIMARY KEY (id, clustering)
> );
> insert into static_delete_test(id, clustering, value, sthstatic) values ('a', 
>  'd', 1, 'statica');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('b', 
>  'd', 2, 'staticb');
> insert into static_delete_test(id, clustering, value, sthstatic) values ('c', 
>  'd', 3, 'staticc');
> delete from static_delete_test where id = 'a' and clustering = 'd';
> select * from static_delete_test;
> {code}
> returns
> {code}
> a,null,statica,null
> c,d,staticc,3
> b,d,staticb,2
> {code}
> Problem occurs only when last row in the partition is deleted;



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11293) NPE when using CQLSSTableWriter

[Will Hayworth (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11293?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182840#comment-15182840
 ] 

Will Hayworth commented on CASSANDRA-11293:
---

I was, and this is very unclear. No assertions are made anywhere I can find in 
the docs about {{CQLSSTableWriter}}'s thread safety or lack thereof, and when I 
saw this on a resolved issue:

{quote}
Currently it is not possible to programatically write multiple SSTables for the 
same table in parallel using the CQLSSTableWriter. 
{quote}

my inference was that it was now possible to do so. That ticket also says the 
*same* table. Is it really possible to use multiple {{CQLSSTableWriters}}s 
writing to the same directory at the same time? I'd be astonished if that were 
so.

> NPE when using CQLSSTableWriter
> ---
>
> Key: CASSANDRA-11293
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11293
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: C* 3.3, C* trunk
>Reporter: Will Hayworth
>
> Hi all!
> I'm trying to using CQLSSTableWriter to load a bunch of historical data into 
> my cluster and I'm getting NullPointerExceptions consistently after having 
> written a few million rows (anywhere from 0.5 to 1.5 GB of data).
> {code}
> java.lang.NullPointerException
> at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at 
> sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
>  at 
> sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
>  at java.lang.reflect.Constructor.newInstance(Constructor.java:422) at 
> java.util.concurrent.ForkJoinTask.getThrowableException(ForkJoinTask.java:598)
>  at java.util.concurrent.ForkJoinTask.reportException(ForkJoinTask.java:677) 
> at java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:735) at 
> java.util.stream.ForEachOps$ForEachOp.evaluateParallel(ForEachOps.java:160) 
> at 
> java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateParallel(ForEachOps.java:174)
>  at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233) at 
> java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418) at 
> java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:583)
>  at 
> com.atlassian.engagementengine.segmentation.helenus.Daemon.main(Daemon.java:24)
> Caused by: java.lang.NullPointerException at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:126)
>  at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:44)
>  at
> java.util.TimSort.binarySort(TimSort.java:296) at
> java.util.TimSort.sort(TimSort.java:239) at
> java.util.Arrays.sort(Arrays.java:1512) at
> org.apache.cassandra.utils.btree.BTree$Builder.sort(BTree.java:1027) at 
> org.apache.cassandra.utils.btree.BTree$Builder.autoEnforce(BTree.java:1036) 
> at org.apache.cassandra.utils.btree.BTree$Builder.build(BTree.java:1075) at 
> org.apache.cassandra.db.partitions.PartitionUpdate.build(PartitionUpdate.java:572)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.maybeBuild(PartitionUpdate.java:562)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.holder(PartitionUpdate.java:370)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:177)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:172)
>  at 
> org.apache.cassandra.io.sstable.SSTableSimpleUnsortedWriter$DiskWriter.run(SSTableSimpleUnsortedWriter.java:209)
> {code}
> This may be a red herring, but I started encountering this when I 
> parallelized writes. (I wasn't aware that doing so was safe until I saw 
> CASSANDRA-7463; I Googled in vain for a while before that.) I'm also 
> definitely not passing any nulls in my {{addRow}} calls.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Comment Edited] (CASSANDRA-11293) NPE when using CQLSSTableWriter

[Will Hayworth (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11293?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182840#comment-15182840
 ] 

Will Hayworth edited comment on CASSANDRA-11293 at 3/7/16 10:18 AM:


I was, and this is very unclear. No assertions are made anywhere I can find in 
the docs about {{CQLSSTableWriter}}'s thread safety or lack thereof, and when I 
saw this on a resolved issue:

{quote}
Currently it is not possible to programatically write multiple SSTables for the 
same table in parallel using the CQLSSTableWriter. 
{quote}

my inference was that it was now possible to do so. That ticket also says the 
*same* table. Is it really possible to use multiple CQLSSTableWriters writing 
to the same directory at the same time? I'd be astonished if that were so.


was (Author: _wsh):
I was, and this is very unclear. No assertions are made anywhere I can find in 
the docs about {{CQLSSTableWriter}}'s thread safety or lack thereof, and when I 
saw this on a resolved issue:

{quote}
Currently it is not possible to programatically write multiple SSTables for the 
same table in parallel using the CQLSSTableWriter. 
{quote}

my inference was that it was now possible to do so. That ticket also says the 
*same* table. Is it really possible to use multiple {{CQLSSTableWriter}}s 
writing to the same directory at the same time? I'd be astonished if that were 
so.

> NPE when using CQLSSTableWriter
> ---
>
> Key: CASSANDRA-11293
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11293
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: C* 3.3, C* trunk
>Reporter: Will Hayworth
>
> Hi all!
> I'm trying to using CQLSSTableWriter to load a bunch of historical data into 
> my cluster and I'm getting NullPointerExceptions consistently after having 
> written a few million rows (anywhere from 0.5 to 1.5 GB of data).
> {code}
> java.lang.NullPointerException
> at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at 
> sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
>  at 
> sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
>  at java.lang.reflect.Constructor.newInstance(Constructor.java:422) at 
> java.util.concurrent.ForkJoinTask.getThrowableException(ForkJoinTask.java:598)
>  at java.util.concurrent.ForkJoinTask.reportException(ForkJoinTask.java:677) 
> at java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:735) at 
> java.util.stream.ForEachOps$ForEachOp.evaluateParallel(ForEachOps.java:160) 
> at 
> java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateParallel(ForEachOps.java:174)
>  at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233) at 
> java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418) at 
> java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:583)
>  at 
> com.atlassian.engagementengine.segmentation.helenus.Daemon.main(Daemon.java:24)
> Caused by: java.lang.NullPointerException at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:126)
>  at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:44)
>  at
> java.util.TimSort.binarySort(TimSort.java:296) at
> java.util.TimSort.sort(TimSort.java:239) at
> java.util.Arrays.sort(Arrays.java:1512) at
> org.apache.cassandra.utils.btree.BTree$Builder.sort(BTree.java:1027) at 
> org.apache.cassandra.utils.btree.BTree$Builder.autoEnforce(BTree.java:1036) 
> at org.apache.cassandra.utils.btree.BTree$Builder.build(BTree.java:1075) at 
> org.apache.cassandra.db.partitions.PartitionUpdate.build(PartitionUpdate.java:572)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.maybeBuild(PartitionUpdate.java:562)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.holder(PartitionUpdate.java:370)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:177)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:172)
>  at 
> org.apache.cassandra.io.sstable.SSTableSimpleUnsortedWriter$DiskWriter.run(SSTableSimpleUnsortedWriter.java:209)
> {code}
> This may be a red herring, but I started encountering this when I 
> parallelized writes. (I wasn't aware that doing so was safe until I saw 
> CASSANDRA-7463; I Googled in vain for a while before that.) I'm also 
> definitely not passing any nulls in my {{addRow}} calls.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Comment Edited] (CASSANDRA-11293) NPE when using CQLSSTableWriter

[Will Hayworth (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11293?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182840#comment-15182840
 ] 

Will Hayworth edited comment on CASSANDRA-11293 at 3/7/16 10:18 AM:


I was, and this is very unclear. No assertions are made anywhere I can find in 
the docs about {{CQLSSTableWriter}}'s thread safety or lack thereof, and when I 
saw this on a resolved issue:

{quote}
Currently it is not possible to programatically write multiple SSTables for the 
same table in parallel using the CQLSSTableWriter. 
{quote}

my inference was that it was now possible to do so. That ticket also says the 
*same* table. Is it really possible to use multiple {{CQLSSTableWriter}}s 
writing to the same directory at the same time? I'd be astonished if that were 
so.


was (Author: _wsh):
I was, and this is very unclear. No assertions are made anywhere I can find in 
the docs about {{CQLSSTableWriter}}'s thread safety or lack thereof, and when I 
saw this on a resolved issue:

{quote}
Currently it is not possible to programatically write multiple SSTables for the 
same table in parallel using the CQLSSTableWriter. 
{quote}

my inference was that it was now possible to do so. That ticket also says the 
*same* table. Is it really possible to use multiple {{CQLSSTableWriters}}s 
writing to the same directory at the same time? I'd be astonished if that were 
so.

> NPE when using CQLSSTableWriter
> ---
>
> Key: CASSANDRA-11293
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11293
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: C* 3.3, C* trunk
>Reporter: Will Hayworth
>
> Hi all!
> I'm trying to using CQLSSTableWriter to load a bunch of historical data into 
> my cluster and I'm getting NullPointerExceptions consistently after having 
> written a few million rows (anywhere from 0.5 to 1.5 GB of data).
> {code}
> java.lang.NullPointerException
> at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at 
> sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
>  at 
> sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
>  at java.lang.reflect.Constructor.newInstance(Constructor.java:422) at 
> java.util.concurrent.ForkJoinTask.getThrowableException(ForkJoinTask.java:598)
>  at java.util.concurrent.ForkJoinTask.reportException(ForkJoinTask.java:677) 
> at java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:735) at 
> java.util.stream.ForEachOps$ForEachOp.evaluateParallel(ForEachOps.java:160) 
> at 
> java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateParallel(ForEachOps.java:174)
>  at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233) at 
> java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418) at 
> java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:583)
>  at 
> com.atlassian.engagementengine.segmentation.helenus.Daemon.main(Daemon.java:24)
> Caused by: java.lang.NullPointerException at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:126)
>  at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:44)
>  at
> java.util.TimSort.binarySort(TimSort.java:296) at
> java.util.TimSort.sort(TimSort.java:239) at
> java.util.Arrays.sort(Arrays.java:1512) at
> org.apache.cassandra.utils.btree.BTree$Builder.sort(BTree.java:1027) at 
> org.apache.cassandra.utils.btree.BTree$Builder.autoEnforce(BTree.java:1036) 
> at org.apache.cassandra.utils.btree.BTree$Builder.build(BTree.java:1075) at 
> org.apache.cassandra.db.partitions.PartitionUpdate.build(PartitionUpdate.java:572)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.maybeBuild(PartitionUpdate.java:562)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.holder(PartitionUpdate.java:370)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:177)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:172)
>  at 
> org.apache.cassandra.io.sstable.SSTableSimpleUnsortedWriter$DiskWriter.run(SSTableSimpleUnsortedWriter.java:209)
> {code}
> This may be a red herring, but I started encountering this when I 
> parallelized writes. (I wasn't aware that doing so was safe until I saw 
> CASSANDRA-7463; I Googled in vain for a while before that.) I'm also 
> definitely not passing any nulls in my {{addRow}} calls.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Alex Petrov (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11310?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182815#comment-15182815
 ] 

Alex Petrov commented on CASSANDRA-11310:
-

[~blerer] absolutely! Will be happy to. I'll check it out in more details 
tonight. 

> Allow filtering on clustering columns for queries without secondary indexes
> ---
>
> Key: CASSANDRA-11310
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Benjamin Lerer
>Assignee: Benjamin Lerer
> Fix For: 3.x
>
>
> Since CASSANDRA-6377 queries without index filtering non-primary key columns 
> are fully supported.
> It makes sense to also support filtering on clustering-columns.
> {code}
> CREATE TABLE emp_table2 (
> empID int,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> PRIMARY KEY (empID, b_yr, b_mon, b_day));
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
> WHERE b_mon='oct' ALLOW FILTERING;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Benjamin Lerer (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11310?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182807#comment-15182807
 ] 

Benjamin Lerer commented on CASSANDRA-11310:


[~ifesdjeen] as you had started to look into the filtering for CASSANDRA-10715, 
would you be interested in working on this issue? 

> Allow filtering on clustering columns for queries without secondary indexes
> ---
>
> Key: CASSANDRA-11310
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Benjamin Lerer
>Assignee: Benjamin Lerer
> Fix For: 3.x
>
>
> Since CASSANDRA-6377 queries without index filtering non-primary key columns 
> are fully supported.
> It makes sense to also support filtering on clustering-columns.
> {code}
> CREATE TABLE emp_table2 (
> empID int,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> PRIMARY KEY (empID, b_yr, b_mon, b_day));
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
> WHERE b_mon='oct' ALLOW FILTERING;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-6377) ALLOW FILTERING should allow seq scan filtering

[Benjamin Lerer (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182801#comment-15182801
 ] 

Benjamin Lerer commented on CASSANDRA-6377:
---

I realize that there is a bit of misscommunication from my part regarding this 
ticket. The committed patches fix only the behavior for filering on non-primary 
key columns.
My intent was to fix the behaviour for this type of queries because we were 
supporting it already partially. It is the main reason why the patch made it to 
3.0.5 and 3.5 (which are bug fix releases). 

Sorry, for not communicating it properly.

I have open CASSANDRA-11310 for dealing with filtering on clustering columns.
 

> ALLOW FILTERING should allow seq scan filtering
> ---
>
> Key: CASSANDRA-6377
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6377
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL
>Reporter: Jonathan Ellis
>Assignee: Benjamin Lerer
>  Labels: cql
> Fix For: 2.2.6, 3.5, 3.0.5
>
>
> CREATE TABLE emp_table2 (
> empID int PRIMARY KEY,
> firstname text,
> lastname text,
> b_mon text,
> b_day text,
> b_yr text,
> );
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (100,'jane','doe','oct','31','1980');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (101,'john','smith','jan','01','1981');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (102,'mary','jones','apr','15','1982');
> INSERT INTO emp_table2 (empID,firstname,lastname,b_mon,b_day,b_yr) 
>VALUES (103,'tim','best','oct','25','1982');
>
> SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2 
> WHERE b_mon='oct' ALLOW FILTERING;
> Bad Request: No indexed columns present in by-columns clause with Equal 
> operator



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11310) Allow filtering on clustering columns for queries without secondary indexes

[Benjamin Lerer (JIRA)]

Benjamin Lerer created CASSANDRA-11310:
--

 Summary: Allow filtering on clustering columns for queries without 
secondary indexes
 Key: CASSANDRA-11310
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11310
 Project: Cassandra
  Issue Type: Improvement
  Components: CQL
Reporter: Benjamin Lerer
Assignee: Benjamin Lerer
 Fix For: 3.x


Since CASSANDRA-6377 queries without index filtering non-primary key columns 
are fully supported.

It makes sense to also support filtering on clustering-columns.

{code}
CREATE TABLE emp_table2 (
empID int,
firstname text,
lastname text,
b_mon text,
b_day text,
b_yr text,
PRIMARY KEY (empID, b_yr, b_mon, b_day));

SELECT b_mon,b_day,b_yr,firstname,lastname FROM emp_table2
WHERE b_mon='oct' ALLOW FILTERING;
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-7987) Better defaults for CQL tables with clustering keys

[Sylvain Lebresne (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-7987?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sylvain Lebresne resolved CASSANDRA-7987.
-
Resolution: Later

I'm skeptical that we can easily find good criterion that guarantees that LCS 
is a better default. I'm also not sure we currently have the ressources to 
properly evaluate such criterion even if we had good candidates, and since that 
issue hasn't been updated in a while, closing as 'Later'.

> Better defaults for CQL tables with clustering keys
> ---
>
> Key: CASSANDRA-7987
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7987
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: T Jake Luciani
>Priority: Minor
>  Labels: lhf
> Fix For: 3.x
>
>
> We currently default to STCS regardless.  If a user creates a table with 
> clustering keys (maybe specifically types with likely high cardinality?)  We 
> should set compaction to LCS.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-10331) Establish and implement canonical bulk reading workload(s)

[Sylvain Lebresne (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10331?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sylvain Lebresne updated CASSANDRA-10331:
-
Reviewer: T Jake Luciani

> Establish and implement canonical bulk reading workload(s)
> --
>
> Key: CASSANDRA-10331
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10331
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Ariel Weisberg
>Assignee: Stefania
> Fix For: 3.x
>
>
> Implement a client, use stress, or extend stress to a bulk reading workload 
> that is indicative of the performance we are trying to improve.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11294) Provide better documentation for caching

[Wei Deng (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11294?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Wei Deng updated CASSANDRA-11294:
-
Labels: docs-impacting  (was: )

> Provide better documentation for caching
> 
>
> Key: CASSANDRA-11294
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11294
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Benjamin Lerer
>Priority: Minor
>  Labels: docs-impacting
>
> I realized that the way caching works in C* is not properly documented. For 
> example the row cache will only be populated for single partition or 
> multi-partitions queries and not range queries. It will also never be 
> populated by secondary index queries even if they are single partition or 
> multi-partitions queries.
> The documentation should be improved to allow people to fully understand how 
> caching works.
>  



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11293) NPE when using CQLSSTableWriter

[Sylvain Lebresne (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11293?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15182743#comment-15182743
 ] 

Sylvain Lebresne commented on CASSANDRA-11293:
--

Are you using a single instance of {{CQLSSTableWriter}} from multiple threads? 
If so, that's wrong, {{CQLSSTableWriter}} is not thread-safe (I'll add 
something to the javadoc in that regard though, since that's arguably not 
clearly stated). In particular CASSANDRA-7463 wasn't saying that 
{{CQLSSTableWriter}} should be thread-safe, it was saying that you should be 
able to use multiple instance of {{CQLSSTableWriter}} (but each one should 
still be used from a single thread) within a single JVM.

> NPE when using CQLSSTableWriter
> ---
>
> Key: CASSANDRA-11293
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11293
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: C* 3.3, C* trunk
>Reporter: Will Hayworth
>
> Hi all!
> I'm trying to using CQLSSTableWriter to load a bunch of historical data into 
> my cluster and I'm getting NullPointerExceptions consistently after having 
> written a few million rows (anywhere from 0.5 to 1.5 GB of data).
> {code}
> java.lang.NullPointerException
> at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at 
> sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
>  at 
> sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
>  at java.lang.reflect.Constructor.newInstance(Constructor.java:422) at 
> java.util.concurrent.ForkJoinTask.getThrowableException(ForkJoinTask.java:598)
>  at java.util.concurrent.ForkJoinTask.reportException(ForkJoinTask.java:677) 
> at java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:735) at 
> java.util.stream.ForEachOps$ForEachOp.evaluateParallel(ForEachOps.java:160) 
> at 
> java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateParallel(ForEachOps.java:174)
>  at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233) at 
> java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418) at 
> java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:583)
>  at 
> com.atlassian.engagementengine.segmentation.helenus.Daemon.main(Daemon.java:24)
> Caused by: java.lang.NullPointerException at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:126)
>  at 
> org.apache.cassandra.db.ClusteringComparator.compare(ClusteringComparator.java:44)
>  at
> java.util.TimSort.binarySort(TimSort.java:296) at
> java.util.TimSort.sort(TimSort.java:239) at
> java.util.Arrays.sort(Arrays.java:1512) at
> org.apache.cassandra.utils.btree.BTree$Builder.sort(BTree.java:1027) at 
> org.apache.cassandra.utils.btree.BTree$Builder.autoEnforce(BTree.java:1036) 
> at org.apache.cassandra.utils.btree.BTree$Builder.build(BTree.java:1075) at 
> org.apache.cassandra.db.partitions.PartitionUpdate.build(PartitionUpdate.java:572)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.maybeBuild(PartitionUpdate.java:562)
>  at 
> org.apache.cassandra.db.partitions.PartitionUpdate.holder(PartitionUpdate.java:370)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:177)
>  at 
> org.apache.cassandra.db.partitions.AbstractBTreePartition.unfilteredIterator(AbstractBTreePartition.java:172)
>  at 
> org.apache.cassandra.io.sstable.SSTableSimpleUnsortedWriter$DiskWriter.run(SSTableSimpleUnsortedWriter.java:209)
> {code}
> This may be a red herring, but I started encountering this when I 
> parallelized writes. (I wasn't aware that doing so was safe until I saw 
> CASSANDRA-7463; I Googled in vain for a while before that.) I'm also 
> definitely not passing any nulls in my {{addRow}} calls.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)