[jira] [Commented] (CASSANDRA-7524) cqlsh fails when version number parts are not int

2014-08-04 Thread Tuukka Mustonen (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7524?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084376#comment-14084376
 ] 

Tuukka Mustonen commented on CASSANDRA-7524:


Would it be possible to fix this already for the next RC release? The problem 
appears with RC-releases due to version identifier containing non-numeric 
parts. After 2.1.0, it's sort of a too late...

 cqlsh fails when version number parts are not int
 -

 Key: CASSANDRA-7524
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7524
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Alexander Bulaev
Assignee: Mikhail Stepura
Priority: Trivial
  Labels: cqlsh
 Fix For: 2.1.1

 Attachments: CASSANDRA-2.1-7524.patch


 {code}
 alexbool@gibson ~ cqlsh
 Traceback (most recent call last):
   File /usr/bin/cqlsh, line 1894, in module
 main(*read_options(sys.argv[1:], os.environ))
   File /usr/bin/cqlsh, line 1877, in main
 single_statement=options.execute)
   File /usr/bin/cqlsh, line 496, in __init__
 self.get_connection_versions()
   File /usr/bin/cqlsh, line 595, in get_connection_versions
 self.cass_ver_tuple = tuple(map(int, vers['build'].split('-', 
 1)[0].split('.')[:3]))
 ValueError: invalid literal for int() with base 10: '0~rc2'
 {code}
 I used cassandra 2.1-rc2 debs from Apache repository



--
This message was sent by Atlassian JIRA
(v6.2#6252)


Git Push Summary

2014-08-04 Thread slebresne
Repository: cassandra
Updated Tags:  refs/tags/2.1.0-rc5-tentative [deleted] cfb335e39


Git Push Summary

2014-08-04 Thread slebresne
Repository: cassandra
Updated Tags:  refs/tags/cassandra-2.1.0-rc5 [created] 5619529ef


svn commit: r1615498 - in /cassandra/site: publish/doc/cql/CQL.html publish/download/index.html src/settings.py

2014-08-04 Thread slebresne
Author: slebresne
Date: Mon Aug  4 08:20:38 2014
New Revision: 1615498

URL: http://svn.apache.org/r1615498
Log:
Update website for 2.1.0-rc5 release

Modified:
cassandra/site/publish/doc/cql/CQL.html
cassandra/site/publish/download/index.html
cassandra/site/src/settings.py

Modified: cassandra/site/publish/doc/cql/CQL.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/publish/doc/cql/CQL.html?rev=1615498r1=1615497r2=1615498view=diff
==
--- cassandra/site/publish/doc/cql/CQL.html (original)
+++ cassandra/site/publish/doc/cql/CQL.html Mon Aug  4 08:20:38 2014
@@ -1,4 +1,4 @@
-?xml version='1.0' encoding='utf-8' ?!DOCTYPE html PUBLIC -//W3C//DTD 
XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;html 
xmlns=http://www.w3.org/1999/xhtml;headmeta http-equiv=Content-Type 
content=text/html; charset=utf-8/titleCQL/title/headbodyp!-- This 
is only a suggestion, to demonstrate that the pre.syntax and pre.sample classes 
should probably be rendered differently. Render as you like. --link 
rel=StyleSheet href=CQL.css type=text/css media=screen/ph1 
id=CassandraQueryLanguageCQLv2.0Cassandra Query Language (CQL) 
v2.0/h1pbspan style=color:redNOTICE/span/b: CQL 2 has been 
deprecated since Cassandra 2.0, and will be removed in Cassandra 3.0.  It is 
recommended that you upgrade to CQL 3, which has much better driver support and 
many new features.  For further reading, see the a 
href=http://cassandra.apache.org/doc/cql3/CQL.html;CQL 3 documentation/a 
and the a href=http://wiki.a
 pache.org/cassandra/ClientOptionsCQL 3 drivers/a./ph2 
id=TableofContentsTable of Contents/h2ol style=list-style: none;lia 
href=CQL.html#CassandraQueryLanguageCQLv2.0Cassandra Query Language (CQL) 
v2.0/aol style=list-style: none;lia 
href=CQL.html#TableofContentsTable of Contents/a/lilia 
href=CQL.html#SyntaxconventionsSyntax conventions/a/lilia 
href=CQL.html#OverallsyntaxOverall syntax/a/lilia 
href=CQL.html#storageTypesData Storage Types/aol style=list-style: 
none;lia href=CQL.html#usingdatesWorking with 
dates/a/li/ol/lilia href=CQL.html#USEUSE/a/lilia 
href=CQL.html#SELECTSELECT/aol style=list-style: none;lia 
href=CQL.html#SpecifyingColumnsSpecifying Columns/a/lilia 
href=CQL.html#ColumnFamilyColumn Family/a/lilia 
href=CQL.html#ConsistencyLevelConsistency Level/a/lilia 
href=CQL.html#FilteringrowsFiltering rows/a/lilia 
href=CQL.html#Limits
 Limits/a/li/ol/lilia href=CQL.html#INSERTINSERT/a/lilia 
href=CQL.html#updateUPDATE/aol style=list-style: none;lia 
href=CQL.html#ColumnFamily2Column Family/a/lilia 
href=CQL.html#ConsistencyLevel2Consistency Level/a/lilia 
href=CQL.html#TimestampTimestamp/a/lilia 
href=CQL.html#TTLTTL/a/lilia 
href=CQL.html#SpecifyingColumnsandRowSpecifying Columns and 
Row/a/lilia href=CQL.html#UpdatingCounterColumnsUpdating Counter 
Columns/a/li/ol/lilia href=CQL.html#DELETEDELETE/aol 
style=list-style: none;lia href=CQL.html#SpecifyingColumns2Specifying 
Columns/a/lilia href=CQL.html#ColumnFamily3Column 
Family/a/lilia href=CQL.html#ConsistencyLevel3Consistency 
Level/a/lilia href=CQL.html#deleterowsSpecifying 
Rows/a/li/ol/lilia href=CQL.html#TRUNCATETRUNCATE/a/lilia 
href=CQL.html#BATCHBATCH/a/lilia href=CQL.html#CREATEKEYSPACECREAT
 E KEYSPACE/a/lilia href=CQL.html#CREATECOLUMNFAMILYCREATE 
COLUMNFAMILY/aol style=list-style: none;lia 
href=CQL.html#keytypesSpecifying Key Type/a/lilia 
href=CQL.html#SpecifyingColumnTypesoptionalSpecifying Column Types 
(optional)/a/lilia href=CQL.html#cfoptsColumn Family Options 
(optional)/a/li/ol/lilia href=CQL.html#CREATEINDEXCREATE 
INDEX/a/lilia href=CQL.html#DROPKEYSPACEDROP KEYSPACE/a/lilia 
href=CQL.html#DROPCOLUMNFAMILYDROP COLUMNFAMILY/a/lilia 
href=CQL.html#DROPINDEXDROP INDEX/a/lilia 
href=CQL.html#ALTERCOLUMNFAMILYALTER COLUMNFAMILY/aol style=list-style: 
none;lia href=CQL.html#ChangingthetypeofatypedcolumnChanging the type 
of a typed column/a/lilia href=CQL.html#AddingatypedcolumnAdding a 
typed column/a/lilia href=CQL.html#DroppingatypedcolumnDropping a 
typed column/a/lilia 
href=CQL.html#ModifyingcolumnfamilypropertiesModifying column fami
 ly properties/a/li/ol/lilia href=CQL.html#CommonIdiomsCommon 
Idioms/aol style=list-style: none;lia 
href=CQL.html#consistencySpecifying 
Consistency/a/li/ol/li/ol/lilia 
href=CQL.html#VersioningVersioning/a/lilia 
href=CQL.html#ChangesChanges/a/li/olh2 id=SyntaxconventionsSyntax 
conventions/h2pTo aid in specifying the CQL syntax, we will use the 
following conventions in this document:/pulliLanguage rules will be given 
in a acronym title=Backus-Naur FormBNF/acronym-like notation, looking 
like this:/li/ulpre class=syntaxprelt;Start ::= lt;CQL_Statement*
+?xml version='1.0' encoding='utf-8' ?!DOCTYPE html PUBLIC -//W3C//DTD 
XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;html 
xmlns=http://www.w3.org/1999/xhtml;headmeta http-equiv=Content-Type 

[jira] [Updated] (CASSANDRA-7576) DateType columns not properly converted to TimestampType when in ReversedType columns.

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7576:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 DateType columns not properly converted to TimestampType when in ReversedType 
 columns.
 --

 Key: CASSANDRA-7576
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7576
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Karl Rieb
Assignee: Karl Rieb
 Fix For: 2.0.10, 2.1 rc5

 Attachments: DataType_CASSANDRA_7576.patch

   Original Estimate: 0.25h
  Remaining Estimate: 0.25h

 The {{org.apache.cassandra.transport.DataType.fromType(AbstractType)}} method 
 has a bug that prevents sending the correct Protocol ID for reversed 
 {{DateType}} columns.   This results in clients receiving Protocol ID {{0}}, 
 which maps to a {{CUSTOM}} type, for timestamp columns that are clustered in 
 reverse order.  
 Some clients can handle this properly since they recognize the 
 {{org.apache.cassandra.db.marshal.DateType}} marshaling type, however the 
 native Datastax java-driver does not.  It will produce errors like the one 
 below when trying to prepare queries against such tables:
 {noformat}
 com.datastax.driver.core.exceptions.InvalidTypeException: Invalid type 
 for value 2 of CQL type 'org.apache.cassandra.db.marshal.DateType', expecting 
 class java.nio.ByteBuffer but class java.util.Date provided
   at com.datastax.driver.core.BoundStatement.bind(BoundStatement.java:190)
   at 
 com.datastax.driver.core.DefaultPreparedStatement.bind(DefaultPreparedStatement.java:103)
 {noformat}
 On the Cassandra side, there is a check for {{DateType}} columns that is 
 supposed to convert these columns to TimestampType.  However, the check is 
 skipped when the column is also reversed.  Specifically:
 {code:title=DataType.java|borderStyle=solid}
 public static PairDataType, Object fromType(AbstractType type)
 {
 // For CQL3 clients, ReversedType is an implementation detail and they
 // shouldn't have to care about it.
 if (type instanceof ReversedType)
 type = ((ReversedType)type).baseType;
 // For compatibility sake, we still return DateType as the timestamp type 
 in resultSet metadata (#5723)
 else if (type instanceof DateType)
 type = TimestampType.instance;
 // ...
 {code}
 The *else if* should be changed to just an *if*, like so:
 {code:title=DataType.java|borderStyle=solid}
 public static PairDataType, Object fromType(AbstractType type)
 {
 // For CQL3 clients, ReversedType is an implementation detail and they
 // shouldn't have to care about it.
 if (type instanceof ReversedType)
 type = ((ReversedType)type).baseType;
 // For compatibility sake, we still return DateType as the timestamp type 
 in resultSet metadata (#5723)
 if (type instanceof DateType)
 type = TimestampType.instance;
 // ...
 {code}
 This bug is preventing us from upgrading our 1.2.11 cluster to 2.0.9 because 
 our clients keep throwing exceptions trying to read or write data to tables 
 with reversed timestamp columns. This issue can be reproduced by creating a 
 CQL table in Cassandra 1.2.11 that clusters on a timestamp in reverse, then 
 upgrading the node to 2.0.9.  When querying the metadata for the table, the 
 node will return Protocol ID 0 (CUSTOM) instead of Protocol ID 11 (TIMESTAMP).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7572) cassandra-env.sh fails to find Java version if JAVA_TOOL_OPTIONS in environment

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7572:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 cassandra-env.sh fails to find Java version if JAVA_TOOL_OPTIONS in 
 environment
 ---

 Key: CASSANDRA-7572
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7572
 Project: Cassandra
  Issue Type: Bug
  Components: Config
 Environment: Linux/darwin/etc
Reporter: Gregory Ramsperger
Assignee: Gregory Ramsperger
 Fix For: 2.0.10, 2.1 rc5


 Parsing of Java version is done in cassandra-env.sh via
 {code}
 java_ver_output=`${JAVA:-java} -version 21`
 jvmver=`echo $java_ver_output | awk -F'' 'NR==1 {print $2}'`
 {code}
 This fails if the first line of output from `java -version` does not contain 
 the version. When JAVA_TOOL_OPTIONS is set as the output is
 {quote}
 Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
 java version 1.7.0_40
 Java(TM) SE Runtime Environment (build 1.7.0_40-b43)
 Java HotSpot(TM) 64-Bit Server VM (build 24.0-b56, mixed mode)
 {quote}
 Parsing this is not guaranteed to work as there is no contract for this 
 output. The recommended way of dealing with this is via a Java application 
 (which will have access to each of these pieces).
 If you want to keep with this model of doing things, you can apply a very 
 small but hacky patch:
 {code}
 -jvmver=`echo $java_ver_output | awk -F'' 'NR==1 {print $2}'`
 +jvmver=`echo $java_ver_output | grep 'java version' | awk -F'' 'NR==1 
 {print $2}'`
  JVM_VERSION=${jvmver%_*}
  JVM_PATCH_VERSION=${jvmver#*_}
 @@ -100,7 +100,7 @@
  fi
 -jvm=`echo $java_ver_output | awk 'NR==2 {print $1}'`
 +jvm=`echo $java_ver_output | grep -A 1 'java version' | awk 'NR==2 {print 
 $1}'`
  case $jvm in
  OpenJDK)
 {code}
 Otherwise, you need to write a java app, compiled for older versions, that 
 returns this data via the java.specification.version and a combination of 
 java.vm.name and java.vm.vendor.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7647) Track min/max timestamps of range tombstones

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7647:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 Track min/max timestamps of range tombstones
 

 Key: CASSANDRA-7647
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7647
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Marcus Eriksson
Assignee: Marcus Eriksson
 Fix For: 2.0.10, 2.1 rc5

 Attachments: 0001-track-rt-in-min-max-timestamps.patch


 When compacting etc. we don't track min/max timestamps of range tombstones, 
 meaning a compacted sstable with only RTs will get bad values.
 End result can be that we drop the sstable since it might look like it only 
 contains tombstones and is older than all other sstables, and we lose the 
 valid RT.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6930) Dynamic Snitch isWorthMergingForRangeQuery Doesn't Handle Some Cases Optimally

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-6930:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 Dynamic Snitch isWorthMergingForRangeQuery Doesn't Handle Some Cases Optimally
 --

 Key: CASSANDRA-6930
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6930
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Tyler Hobbs
Assignee: Ala' Alkhaldi
Priority: Minor
  Labels: lhf
 Fix For: 2.0.10, 2.1 rc5

 Attachments: 9630-v1.txt


 I was investigating slow responses for queries like {{select * from 
 system.peers}} and noticed that the dynamic endpoint snitch was reporting 
 that the query was _not_ worth merging.  In this case, the local host had a 
 score of 0, so {{return maxMerged  maxL1 + maxL2}} was returning false.  I 
 believe using a {{=}} condition is the proper fix there.
 Additionally, because scores are looked up three separate times, this method 
 is a prone to race conditions.  I don't think it's worth fixing the race 
 condition for a multi-node scenario, but at least in the single-node case, we 
 can immediately return true and avoid any race conditions that would cause it 
 to erroneously return false.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7649) remove ability to change num_tokens

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7649:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 remove ability to change num_tokens
 ---

 Key: CASSANDRA-7649
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7649
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams
 Fix For: 2.0.10, 2.1 rc5

 Attachments: 7649.txt


 Post CASSANDRA-7601, we should also remove the ability to jump from one token 
 to 256, since this leaves you in a meaningless, somewhat broken, state.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7595) EmbeddedCassandraService class should provide a stop method

2014-08-04 Thread Lyuben Todorov (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7595?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084426#comment-14084426
 ] 

Lyuben Todorov commented on CASSANDRA-7595:
---

[~mirko.tschaeni] WDUT?

 EmbeddedCassandraService class should provide a stop method
 ---

 Key: CASSANDRA-7595
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7595
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Mirko Tschäni
Assignee: Mirko Tschäni
Priority: Minor
 Fix For: 1.2.19, 2.0.10, 2.1.1

 Attachments: 7595.diff


 The EmbeddedCassandraService does only provide a start method. 
 It should also provide a stop method.
 We use EmbeddedCassandraService to embed cassandra in a osgi application and 
 need to be able to shut down cassandra so that no non daemon threads remain.
 Implementation would be straight forward:
 add the following method to EmbeddedCassandraService:
 public void stop() {
  cassandraDaemon.stop();
 }
 I have tested this implementation locally and it worked as expected (stops 
 all non daemon threads).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7668) Make gc_grace_seconds 7 days for system tables

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7668:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 Make gc_grace_seconds 7 days for system tables
 --

 Key: CASSANDRA-7668
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7668
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Tyler Hobbs
Assignee: Tyler Hobbs
Priority: Minor
 Fix For: 1.2.19, 2.0.10, 2.1 rc5

 Attachments: 7668-1.2.txt, 7668-2.0.txt


 The system tables have had a {{gc_grace_seconds}} of 8640 since 
 CASSANDRA-4018.  This was probably a typo and was intended to be 10 days.  In 
 CASSANDRA-6717 we will set gc_grace to seven days, so that would be a 
 reasonable value to use here.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7511) Always flush on TRUNCATE

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7511:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 Always flush on TRUNCATE
 

 Key: CASSANDRA-7511
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7511
 Project: Cassandra
  Issue Type: Bug
 Environment: CentOS 6.5, Oracle Java 7u60, C* 2.0.6, 2.0.9, including 
 earlier 1.0.* versions.
Reporter: Viktor Jevdokimov
Assignee: Jeremiah Jordan
Priority: Minor
  Labels: commitlog
 Fix For: 2.0.10, 2.1 rc5

 Attachments: 7511-2.0-v2.txt, 7511-v3-remove-renewMemtable.txt, 
 7511-v3-test.txt, 7511-v3.txt, 7511.txt


 Commit log grows infinitely after CF truncate operation via cassandra-cli, 
 regardless CF receives writes or not thereafter.
 CF's could be non-CQL Standard and Super column type. Creation of snapshots 
 after truncate is turned off.
 Commit log may start grow promptly, may start grow later, on a few only or on 
 all nodes at once.
 Nothing special in the system log. No idea how to reproduce.
 After rolling restart commit logs are cleared and back to normal. Just 
 annoying to do rolling restart after each truncate.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7601) Data loss after nodetool taketoken

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7601:


Fix Version/s: (was: 2.1.0)
   2.1 rc5

 Data loss after nodetool taketoken
 --

 Key: CASSANDRA-7601
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7601
 Project: Cassandra
  Issue Type: Bug
  Components: Core, Tests
 Environment: Mac OSX Mavericks. Ubuntu 14.04
Reporter: Philip Thompson
Assignee: Brandon Williams
Priority: Minor
 Fix For: 1.2.19, 2.0.10, 2.1 rc5

 Attachments: 7601-1.2.txt, 7601-2.0.txt, 7601-2.1.txt, 
 consistent_bootstrap_test.py, taketoken.tar.gz


 The dtest 
 consistent_bootstrap_test.py:TestBootstrapConsistency.consistent_reads_after_relocate_test
  is failing on HEAD of the git branches 2.1 and 2.1.0.
 The test performs the following actions:
 - Create a cluster of 3 nodes
 - Create a keyspace with RF 2
 - Take node 3 down
 - Write 980 rows to node 2 with CL ONE
 - Flush node 2
 - Bring node 3 back up
 - Run nodetool taketoken on node 3 to transfer 80% of node 1's tokens to node 
 3
 - Check for data loss
 When the check for data loss is performed, only ~725 rows can be read via CL 
 ALL.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7595) EmbeddedCassandraService class should provide a stop method

2014-08-04 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7595?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084442#comment-14084442
 ] 

Mirko Tschäni commented on CASSANDRA-7595:
--

The solution proposed in 7595.diff is exactly what we would like to have. 
Calling CasandraDaemon#deactivate instead of stop is perfect.

 EmbeddedCassandraService class should provide a stop method
 ---

 Key: CASSANDRA-7595
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7595
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Mirko Tschäni
Assignee: Mirko Tschäni
Priority: Minor
 Fix For: 1.2.19, 2.0.10, 2.1.1

 Attachments: 7595.diff


 The EmbeddedCassandraService does only provide a start method. 
 It should also provide a stop method.
 We use EmbeddedCassandraService to embed cassandra in a osgi application and 
 need to be able to shut down cassandra so that no non daemon threads remain.
 Implementation would be straight forward:
 add the following method to EmbeddedCassandraService:
 public void stop() {
  cassandraDaemon.stop();
 }
 I have tested this implementation locally and it worked as expected (stops 
 all non daemon threads).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7618) Upgrade Cassandra Java driver to 2.0.3 release

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7618:


  Reviewer: Sylvain Lebresne
Issue Type: Improvement  (was: New Feature)

 Upgrade Cassandra Java driver to 2.0.3 release
 --

 Key: CASSANDRA-7618
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7618
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Reporter: Alex Liu
Assignee: Alex Liu
Priority: Minor
 Fix For: 2.0.10

 Attachments: 7618.txt


 I got the following errors after upgrading to 2.0.3, need change our code 
 accordingly.
 {code}
 14/07/24 15:37:21 DEBUG input.HiveCqlInputFormat: column mappings: x,y,z
 14/07/24 15:37:21 DEBUG input.HiveCqlInputFormat: input query: SELECT 
 x,y,z FROM ks.tab WHERE token(x)  ? AND token(x) = ? 
 14/07/24 15:37:21 WARN cql3.CqlRecordReader: Failed to create authenticated 
 client to localhost
 Failed with exception java.io.IOException:java.io.IOException: 
 java.lang.RuntimeException: java.lang.IllegalArgumentException: Min 
 simultaneous requests per connection for REMOTE hosts must be less than max 
 (25  0)
 14/07/24 15:37:21 ERROR CliDriver: Failed with exception 
 java.io.IOException:java.io.IOException: java.lang.RuntimeException: 
 java.lang.IllegalArgumentException: Min simultaneous requests per connection 
 for REMOTE hosts must be less than max (25  0)
 java.io.IOException: java.io.IOException: java.lang.RuntimeException: 
 java.lang.IllegalArgumentException: Min simultaneous requests per connection 
 for REMOTE hosts must be less than max (25  0)
   at 
 org.apache.hadoop.hive.ql.exec.FetchOperator.getNextRow(FetchOperator.java:551)
   at 
 org.apache.hadoop.hive.ql.exec.FetchOperator.pushRow(FetchOperator.java:489)
   at org.apache.hadoop.hive.ql.exec.FetchTask.fetch(FetchTask.java:136)
   at org.apache.hadoop.hive.ql.Driver.getResults(Driver.java:1471)
   at 
 org.apache.hadoop.hive.cli.CliDriver.processLocalCmd(CliDriver.java:271)
   at org.apache.hadoop.hive.cli.CliDriver.processCmd(CliDriver.java:216)
   at org.apache.hadoop.hive.cli.CliDriver.processLine(CliDriver.java:413)
   at 
 org.apache.hadoop.hive.cli.CliDriver.executeDriver(CliDriver.java:781)
   at org.apache.hadoop.hive.cli.CliDriver.run(CliDriver.java:675)
   at org.apache.hadoop.hive.cli.CliDriver.main(CliDriver.java:614)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at 
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
   at 
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   at java.lang.reflect.Method.invoke(Method.java:606)
   at org.apache.hadoop.util.RunJar.main(RunJar.java:156)
 Caused by: java.io.IOException: java.lang.RuntimeException: 
 java.lang.IllegalArgumentException: Min simultaneous requests per connection 
 for REMOTE hosts must be less than max (25  0)
   at 
 org.apache.hadoop.hive.cassandra.cql3.input.HiveCqlInputFormat.getRecordReader(HiveCqlInputFormat.java:206)
   at 
 org.apache.hadoop.hive.ql.exec.FetchOperator.getRecordReader(FetchOperator.java:433)
   at 
 org.apache.hadoop.hive.ql.exec.FetchOperator.getNextRow(FetchOperator.java:515)
   ... 14 more
 Caused by: java.lang.RuntimeException: java.lang.IllegalArgumentException: 
 Min simultaneous requests per connection for REMOTE hosts must be less than 
 max (25  0)
   at 
 org.apache.cassandra.hadoop.cql3.CqlRecordReader.initialize(CqlRecordReader.java:123)
   at 
 org.apache.hadoop.hive.cassandra.cql3.input.CqlHiveRecordReader.initialize(CqlHiveRecordReader.java:95)
   at 
 org.apache.hadoop.hive.cassandra.cql3.input.HiveCqlInputFormat.getRecordReader(HiveCqlInputFormat.java:201)
   ... 16 more
 Caused by: java.lang.IllegalArgumentException: Min simultaneous requests per 
 connection for REMOTE hosts must be less than max (25  0)
   at 
 com.datastax.driver.core.PoolingOptions.checkRequestsPerConnectionOrder(PoolingOptions.java:238)
   at 
 com.datastax.driver.core.PoolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(PoolingOptions.java:147)
   at 
 org.apache.cassandra.hadoop.cql3.CqlConfigHelper.getReadPoolingOptions(CqlConfigHelper.java:431)
   at 
 org.apache.cassandra.hadoop.cql3.CqlConfigHelper.getInputCluster(CqlConfigHelper.java:298)
   at 
 org.apache.cassandra.hadoop.cql3.CqlRecordReader.initialize(CqlRecordReader.java:109)
   ... 18 more
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7225) cqlsh help for CQL3 is often incorrect and should be modernized

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7225:


Reviewer: Tyler Hobbs

 cqlsh help for CQL3 is often incorrect and should be modernized
 ---

 Key: CASSANDRA-7225
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7225
 Project: Cassandra
  Issue Type: Bug
  Components: Documentation  website, Tools
Reporter: Robert Stupp
Assignee: Mikhail Stepura
Priority: Trivial
  Labels: cql
 Attachments: 7225-cqlhelp.txt


 Just a small line of text in cqlsh help command indicates that  is = and 
  is = in CQL.
 This is confusing to many people (including me :) ) because I did not expect 
  to return the equals portion.
 Please allow distinct behaviours for , =,  and = in CQL queries. Maybe in 
 combination with CASSANDRA-5184 and/or CASSANDRA-4914 



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7575) Custom 2i validation

2014-08-04 Thread Sergio Bossa (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7575?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084497#comment-14084497
 ] 

Sergio Bossa commented on CASSANDRA-7575:
-

+1 for v4 patch.

 Custom 2i validation
 

 Key: CASSANDRA-7575
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7575
 Project: Cassandra
  Issue Type: Improvement
  Components: API
Reporter: Andrés de la Peña
Assignee: Andrés de la Peña
Priority: Minor
  Labels: 2i, cql3, secondaryIndex, secondary_index, select
 Fix For: 2.1.1

 Attachments: 2i_validation.patch, 2i_validation_v2.patch, 
 2i_validation_v3.patch, 2i_validation_v4.patch


 There are several projects using custom secondary indexes as an extension 
 point to integrate C* with other systems such as Solr or Lucene. The usual 
 approach is to embed third party indexing queries in CQL clauses. 
 For example, [DSE 
 Search|http://www.datastax.com/what-we-offer/products-services/datastax-enterprise]
  embeds Solr syntax this way:
 {code}
 SELECT title FROM solr WHERE solr_query='title:natio*';
 {code}
 [Stratio platform|https://github.com/Stratio/stratio-cassandra] embeds custom 
 JSON syntax for searching in Lucene indexes:
 {code}
 SELECT * FROM tweets WHERE lucene='{
 filter : {
 type: range,
 field: time,
 lower: 2014/04/25,
 upper: 2014/04/1
 },
 query  : {
 type: phrase, 
 field: body, 
 values: [big, data]
 },
 sort  : {fields: [ {field:time, reverse:true} ] }
 }';
 {code}
 Tuplejump [Stargate|http://tuplejump.github.io/stargate/] also uses the 
 Stratio's open source JSON syntax:
 {code}
 SELECT name,company FROM PERSON WHERE stargate ='{
 filter: {
 type: range,
 field: company,
 lower: a,
 upper: p
 },
 sort:{
fields: [{field:name,reverse:true}]
 }
 }';
 {code}
 These syntaxes are validated by the corresponding 2i implementation. This 
 validation is done behind the StorageProxy command distribution. So, far as I 
 know, there is no way to give rich feedback about syntax errors to CQL users.
 I'm uploading a patch with some changes trying to improve this. I propose 
 adding an empty validation method to SecondaryIndexSearcher that can be 
 overridden by custom 2i implementations:
 {code}
 public void validate(ListIndexExpression clause) {}
 {code}
 And call it from SelectStatement#getRangeCommand:
 {code}
 ColumnFamilyStore cfs = 
 Keyspace.open(keyspace()).getColumnFamilyStore(columnFamily());
 for (SecondaryIndexSearcher searcher : 
 cfs.indexManager.getIndexSearchersForQuery(expressions))
 {
 try
 {
 searcher.validate(expressions);
 }
 catch (RuntimeException e)
 {
 String exceptionMessage = e.getMessage();
 if (exceptionMessage != null 
  !exceptionMessage.trim().isEmpty())
 throw new InvalidRequestException(
 Invalid index expression:  + e.getMessage());
 else
 throw new InvalidRequestException(
 Invalid index expression);
 }
 }
 {code}
 In this way C* allows custom 2i implementations to give feedback about syntax 
 errors.
 We are currently using these changes in a fork with no problems.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7670) selecting field from empty UDT cell using dot notation triggers exception

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7670:


Fix Version/s: (was: 2.1.1)
   2.1.0

 selecting field from empty UDT cell using dot notation triggers exception
 -

 Key: CASSANDRA-7670
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7670
 Project: Cassandra
  Issue Type: Bug
Reporter: Russ Hatch
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 2.1.0

 Attachments: CASSANDRA-2.1.0-7670.patch


 Hopefully the title explains the issue.
 Basically if a row has a user type which is undefined, using the dot 
 notation syntax causes cqlsh to show a NPE, and an exception ends up in the 
 log as well.
 I would expect the behavior here to execute the query and return null, since 
 the user type itself is null, then it's fields are null as well (the downside 
 here is there would be no way to distinguish between a null UDT and a null 
 UDT field, without making an initial query to check if the UDT is non-null).
 Steps to repro:
 {noformat}
 create keyspace test with replication = {'class':'SimpleStrategy', 
 'replication_factor':1};
 use test;
 CREATE TYPE t_item (subitem text);
 create table mytable (value1 text PRIMARY KEY, value2 text, item t_item);
 insert into mytable (value1, value2 ) values ('foo', 'bar');
 select item.subitem from mytable;
 ErrorMessage code= [Server error] 
 message=java.lang.NullPointerException
 {noformat}
 Here's the exception logged:
 {noformat}
 ERROR [SharedPool-Worker-1] 2014-08-01 15:49:00,514 ErrorMessage.java:218 - 
 Unexpected exception during request
 java.lang.NullPointerException: null
 at 
 org.apache.cassandra.db.marshal.TupleType.split(TupleType.java:146) 
 ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.Selection$FieldSelector.compute(Selection.java:469)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.Selection$SelectionWithFunctions.handleRow(Selection.java:537)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.Selection$ResultSetBuilder.build(Selection.java:333)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.SelectStatement.process(SelectStatement.java:1149)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.SelectStatement.processResults(SelectStatement.java:283)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:225)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:60)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:187)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:206) 
 ~[main/:na]
 at 
 org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:118)
  ~[main/:na]
 at 
 org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:421)
  [main/:na]
 at 
 org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:318)
  [main/:na]
 at 
 io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:103)
  [netty-all-4.0.20.Final.jar:4.0.20.Final]
 at 
 io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:332)
  [netty-all-4.0.20.Final.jar:4.0.20.Final]
 at 
 io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:31)
  [netty-all-4.0.20.Final.jar:4.0.20.Final]
 at 
 io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:323)
  [netty-all-4.0.20.Final.jar:4.0.20.Final]
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) 
 [na:1.7.0_65]
 at 
 org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:163)
  [main/:na]
 at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:103) 
 [main/:na]
 at java.lang.Thread.run(Thread.java:745) [na:1.7.0_65]
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Created] (CASSANDRA-7683) Always allow CREATE TABLE IF NOT EXISTS if it exists

2014-08-04 Thread Jens Rantil (JIRA)
Jens Rantil created CASSANDRA-7683:
--

 Summary: Always allow CREATE TABLE IF NOT EXISTS if it exists
 Key: CASSANDRA-7683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7683
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Jens Rantil
Priority: Minor


Background: I have a table that I'd like to make sure exists when I boot up my 
application. To make the life easier for our developers I execute an `ALTER 
TABLE IF EXISTS`.

In production I am using user based authorization and for security reasons 
regular production users are not allowed to CREATE TABLEs.

Problem: When a user without CREATE permission executes `ALTER TABLE IF EXISTS` 
for a table that already exists, the command fails telling me the user is not 
allowed to execute `CREATE TABLE`. It feels kinda ridiculous that this fails 
when I'm not actually creating the table.

Proposal: That the permission check only should be done if the table is only 
actually to be created. 

Workaround: Right now, I have a boolean that checks if in production and in 
that case don't try to create the table. Another approach would be to manually 
check if the table exists.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7683) Always allow CREATE TABLE IF NOT EXISTS if it exists

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084552#comment-14084552
 ] 

Robert Stupp commented on CASSANDRA-7683:
-

[~ztyx] which C* are you using? Can you post a complete command sequence - e.g. 
from cqlsh ?


 Always allow CREATE TABLE IF NOT EXISTS if it exists
 

 Key: CASSANDRA-7683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7683
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Jens Rantil
Priority: Minor

 Background: I have a table that I'd like to make sure exists when I boot up 
 my application. To make the life easier for our developers I execute an 
 `ALTER TABLE IF EXISTS`.
 In production I am using user based authorization and for security reasons 
 regular production users are not allowed to CREATE TABLEs.
 Problem: When a user without CREATE permission executes `ALTER TABLE IF 
 EXISTS` for a table that already exists, the command fails telling me the 
 user is not allowed to execute `CREATE TABLE`. It feels kinda ridiculous that 
 this fails when I'm not actually creating the table.
 Proposal: That the permission check only should be done if the table is only 
 actually to be created. 
 Workaround: Right now, I have a boolean that checks if in production and in 
 that case don't try to create the table. Another approach would be to 
 manually check if the table exists.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7683) Always allow CREATE TABLE IF NOT EXISTS if it exists

2014-08-04 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084556#comment-14084556
 ] 

Aleksey Yeschenko commented on CASSANDRA-7683:
--

Well, authorization is here to tell if a user has enough permissions to execute 
that particular statement. And, arguably, whether or not the table exists, if 
one doesn't have CREATE rights on the keyspace, they shouldn't be able to try 
execute the statement. IF NOT EXISTS is absolutely orthogonal here.

 Always allow CREATE TABLE IF NOT EXISTS if it exists
 

 Key: CASSANDRA-7683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7683
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Jens Rantil
Priority: Minor

 Background: I have a table that I'd like to make sure exists when I boot up 
 my application. To make the life easier for our developers I execute an 
 `ALTER TABLE IF EXISTS`.
 In production I am using user based authorization and for security reasons 
 regular production users are not allowed to CREATE TABLEs.
 Problem: When a user without CREATE permission executes `ALTER TABLE IF 
 EXISTS` for a table that already exists, the command fails telling me the 
 user is not allowed to execute `CREATE TABLE`. It feels kinda ridiculous that 
 this fails when I'm not actually creating the table.
 Proposal: That the permission check only should be done if the table is only 
 actually to be created. 
 Workaround: Right now, I have a boolean that checks if in production and in 
 that case don't try to create the table. Another approach would be to 
 manually check if the table exists.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7569) IndexOutOfBoundsException when building SyntaxError message snippet

2014-08-04 Thread Benjamin Lerer (JIRA)

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

Benjamin Lerer updated CASSANDRA-7569:
--

Attachment: CASSANDRA-7569.txt

When the error is caused by an extra token at the end of the query it seems 
that the ANTLR can return an invalid index for the token position.

 IndexOutOfBoundsException when building SyntaxError message snippet
 ---

 Key: CASSANDRA-7569
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7569
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Tyler Hobbs
Assignee: Benjamin Lerer
Priority: Minor
 Fix For: 2.1.1

 Attachments: CASSANDRA-7569.txt


 When parsing the following query (which is expected to fail), an 
 IndexOutOfBoundsException is hit when looking up the bad token:
 {noformat}
 CREATE TABLE mytable (k int PRIMARY KEY,  v_1 tupleint,  v_2 tupleint, 
 int,  v_3 tupleint, int, int,  v_384 tupleint, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, 
 int, int, int))
 {noformat}
 Here's the stacktrace (after I added a log statement, which we should 
 probably make permanent at DEBUG level):
 {noformat}
 ERROR [SharedPool-Worker-3] 2014-07-17 21:30:58,165 QueryProcessor.java:465 - 
 Exception parsing statement:
 java.lang.IndexOutOfBoundsException: Index: 1206, Size: 1206
 at java.util.ArrayList.rangeCheck(ArrayList.java:635) ~[na:1.7.0_45]
 at java.util.ArrayList.get(ArrayList.java:411) ~[na:1.7.0_45]
 at org.antlr.runtime.CommonTokenStream.get(CommonTokenStream.java:296) 
 ~[antlr-3.2.jar:na]
 at 
 org.apache.cassandra.cql3.ErrorCollector.appendQuerySnippet(ErrorCollector.java:118)
  ~[main/:na]
 at 
 org.apache.cassandra.cql3.ErrorCollector.syntaxError(ErrorCollector.java:79) 
 ~[main/:na]
 at 
 org.apache.cassandra.cql3.CqlParser.displayRecognitionError(CqlParser.java:266)
  ~[main/:na]
 at org.antlr.runtime.BaseRecognizer.reportError(BaseRecognizer.java:186) 
 ~[antlr-3.2.jar:na]
 at 
 org.antlr.runtime.BaseRecognizer.recoverFromMismatchedToken(BaseRecognizer.java:596)
  ~[antlr-3.2.jar:na]
 at org.antlr.runtime.BaseRecognizer.match(BaseRecognizer.java:115) 
 ~[antlr-3.2.jar:na]
 at org.apache.cassandra.cql3.CqlParser.query(CqlParser.java:367) 
 ~[main/:na]
 at 
 org.apache.cassandra.cql3.QueryProcessor.parseStatement(QueryProcessor.java:455)
  [main/:na]
 at 
 org.apache.cassandra.cql3.QueryProcessor.getStatement(QueryProcessor.java:430)
  [main/:na]
 at 
 org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:200) 
 [main/:na]
 at 
 org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:118)
  [main/:na]
 at 
 org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:421)
  [main/:na]
 at 
 org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:318)
  

[jira] [Updated] (CASSANDRA-6599) CQL updates should support column = column - { key1, key2, ... } syntax for removing map elements

2014-08-04 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko updated CASSANDRA-6599:
-

Reviewer: Sylvain Lebresne  (was: Aleksey Yeschenko)

I have a minor preference for simply allowing nulls as map values, but it's a 
very weak one.

Deferring the decision/review to Sylvain.

 CQL updates should support column = column - { key1, key2, ... } syntax for 
 removing map elements
 ---

 Key: CASSANDRA-6599
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6599
 Project: Cassandra
  Issue Type: Wish
Reporter: Gavin
Assignee: Benjamin Lerer
Priority: Minor
  Labels: cql
 Fix For: 2.1.1

 Attachments: 6599-proto.txt, CASSANDRA-6599.txt


 A variable number number of elements can be removed from lists and sets using 
 an update statement of the form update  set column=column - {} where 
   This syntax should also be supported for map columns.  This would be 
 especially useful for prepared statements (I know that you can use set 
 column[...] = null to remove items in an update statement, but that only 
 works for one element at a time).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7536) High resolution types for timestamp and time

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7536:


Priority: Minor  (was: Major)

 High resolution types for timestamp and time
 

 Key: CASSANDRA-7536
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7536
 Project: Cassandra
  Issue Type: New Feature
Reporter: Robert Stupp
Priority: Minor

 CASSANDRA-7523 adds support for _date_ and _time_ data types using the same 
 precision as current _timestamp_ type.
 This ticket is about to add high resolution (nanosecond precision) types for 
 timestamp and time. It should be easy to use with Joda API and Java 8 
 {{java.time}} API.
 Additionally support for time zone / offset (might need be handled 
 differently) could be introduced using new time and timestamp types.
 Idea for binary serialization format (from java.time API):
 {{(int)year (short)month (short)day (byte)hour (byte)minute (byte)second 
 (int)nano (int)offsetInSeconds}}
 Additional thinking is required to make even the time zone / offset types 
 comparable (even for different TZ offsets) - so these might not be covered by 
 this ticket.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7536) High resolution types for timestamp and time

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7536?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084582#comment-14084582
 ] 

Sylvain Lebresne commented on CASSANDRA-7536:
-

A priori, I'm not convinced nanosecond resolution times are common enough in 
the wild that it's worth creeping up the CQL types.

 High resolution types for timestamp and time
 

 Key: CASSANDRA-7536
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7536
 Project: Cassandra
  Issue Type: New Feature
Reporter: Robert Stupp
Priority: Minor

 CASSANDRA-7523 adds support for _date_ and _time_ data types using the same 
 precision as current _timestamp_ type.
 This ticket is about to add high resolution (nanosecond precision) types for 
 timestamp and time. It should be easy to use with Joda API and Java 8 
 {{java.time}} API.
 Additionally support for time zone / offset (might need be handled 
 differently) could be introduced using new time and timestamp types.
 Idea for binary serialization format (from java.time API):
 {{(int)year (short)month (short)day (byte)hour (byte)minute (byte)second 
 (int)nano (int)offsetInSeconds}}
 Additional thinking is required to make even the time zone / offset types 
 comparable (even for different TZ offsets) - so these might not be covered by 
 this ticket.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


git commit: Fix changelog

2014-08-04 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 57abab1f2 - 520de135f


Fix changelog


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

Branch: refs/heads/cassandra-2.1.0
Commit: 520de135f7ef14172c8b64883c8392940dddc56b
Parents: 57abab1
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:14:23 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:14:23 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/520de135/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index eaa3b43..0927a30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0-final
+
+2.1.0-rc5
  * Reject counters inside user types (CASSANDRA-7672)
  * Switch to notification-based GCInspector (CASSANDRA-7638)
  * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)



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

2014-08-04 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f302eb78445119372770e54dfd32837aa3c0912a
Parents: 8d06dd1 520de13
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:14:49 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:14:49 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f302eb78/CHANGES.txt
--
diff --cc CHANGES.txt
index 24d3d50,0927a30..e2cc92b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +
 +
  2.1.0-final
+ 
+ 2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)
   * Switch to notification-based GCInspector (CASSANDRA-7638)
   * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)



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

2014-08-04 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: f302eb78445119372770e54dfd32837aa3c0912a
Parents: 8d06dd1 520de13
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:14:49 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:14:49 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f302eb78/CHANGES.txt
--
diff --cc CHANGES.txt
index 24d3d50,0927a30..e2cc92b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +
 +
  2.1.0-final
+ 
+ 2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)
   * Switch to notification-based GCInspector (CASSANDRA-7638)
   * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)



[1/3] git commit: Fix changelog

2014-08-04 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/trunk d6f3cdf6f - c770256a7


Fix changelog


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

Branch: refs/heads/trunk
Commit: 520de135f7ef14172c8b64883c8392940dddc56b
Parents: 57abab1
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:14:23 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:14:23 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/520de135/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index eaa3b43..0927a30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0-final
+
+2.1.0-rc5
  * Reject counters inside user types (CASSANDRA-7672)
  * Switch to notification-based GCInspector (CASSANDRA-7638)
  * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)



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

2014-08-04 Thread slebresne
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c770256a7928448b2257f419917d51e905129d3d
Parents: d6f3cdf f302eb7
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:15:08 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:15:08 2014 +0200

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


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



[1/2] git commit: Fix changelog

2014-08-04 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8d06dd102 - f302eb784


Fix changelog


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

Branch: refs/heads/cassandra-2.1
Commit: 520de135f7ef14172c8b64883c8392940dddc56b
Parents: 57abab1
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 4 14:14:23 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 4 14:14:23 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/520de135/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index eaa3b43..0927a30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0-final
+
+2.1.0-rc5
  * Reject counters inside user types (CASSANDRA-7672)
  * Switch to notification-based GCInspector (CASSANDRA-7638)
  * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)



[jira] [Updated] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-7669:
--

Fix Version/s: 2.0.10
 Assignee: Robert Stupp

Can you have a look, [~snazy]?

 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 2.0.10, 2.1.1

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


git commit: fix warnings for _ as identifier patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7675

2014-08-04 Thread jbellis
Repository: cassandra
Updated Branches:
  refs/heads/trunk c770256a7 - f47863e13


fix warnings for _ as identifier
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7675


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

Branch: refs/heads/trunk
Commit: f47863e13c91566aca5f8a25cfa247b7ea27ec59
Parents: c770256
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 07:28:58 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 07:28:58 2014 -0500

--
 .../unit/org/apache/cassandra/io/util/DataOutputTest.java |  3 ++-
 .../cassandra/stress/settings/OptionDistribution.java | 10 +-
 .../cassandra/stress/settings/OptionReplication.java  |  3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f47863e1/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
--
diff --git a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java 
b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
index 76f3304..fcf7721 100644
--- a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
+++ b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
@@ -236,8 +236,9 @@ public class DataOutputTest
 test.readInt();
 assert false;
 }
-catch (EOFException _)
+catch (EOFException ignore)
 {
+// it worked
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f47863e1/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java 
b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
index 70a85ae..b01e55a 100644
--- 
a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
+++ 
b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
@@ -189,7 +189,7 @@ public class OptionDistribution extends Option
 stdev = ((max - min) / 2d) / stdevsToEdge;
 }
 return new GaussianFactory(min, max, mean, stdev);
-} catch (Exception _)
+} catch (Exception e)
 {
 throw new IllegalArgumentException(Invalid parameter list for 
uniform distribution:  + params);
 }
@@ -213,7 +213,7 @@ public class OptionDistribution extends Option
 // over entire range, but this results in overly skewed 
distribution, so take sqrt
 final double mean = (max - min) / 
findBounds.inverseCumulativeProbability(1d - Math.sqrt(1d/(max-min)));
 return new ExpFactory(min, max, mean);
-} catch (Exception _)
+} catch (Exception e)
 {
 throw new IllegalArgumentException(Invalid parameter list for 
uniform distribution:  + params);
 }
@@ -238,7 +238,7 @@ public class OptionDistribution extends Option
 // over entire range, but this results in overly skewed 
distribution, so take sqrt
 final double scale = (max - min) / 
findBounds.inverseCumulativeProbability(1d - Math.sqrt(1d/(max-min)));
 return new ExtremeFactory(min, max, shape, scale);
-} catch (Exception _)
+} catch (Exception e)
 {
 throw new IllegalArgumentException(Invalid parameter list for 
extreme (Weibull) distribution:  + params);
 }
@@ -259,7 +259,7 @@ public class OptionDistribution extends Option
 final long min = parseLong(bounds[0]);
 final long max = parseLong(bounds[1]);
 return new UniformFactory(min, max);
-} catch (Exception _)
+} catch (Exception e)
 {
 throw new IllegalArgumentException(Invalid parameter list for 
uniform distribution:  + params);
 }
@@ -278,7 +278,7 @@ public class OptionDistribution extends Option
 {
 final long key = parseLong(params.get(0));
 return new FixedFactory(key);
-} catch (Exception _)
+} catch (Exception e)
 {
 throw new IllegalArgumentException(Invalid parameter list for 
uniform distribution:  + params);
 }


[1/3] git commit: Add support for custom 2i validation patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575

2014-08-04 Thread jbellis
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f302eb784 - 5009ee31b
  refs/heads/trunk f47863e13 - f1b0c26a1


Add support for custom 2i validation
patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575


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

Branch: refs/heads/cassandra-2.1
Commit: 5009ee31b933fcc5843417fd65ab9ff91bb74e73
Parents: f302eb7
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 07:32:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 07:32:56 2014 -0500

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 15 -
 .../db/index/SecondaryIndexManager.java | 47 
 .../db/index/SecondaryIndexSearcher.java| 12 
 .../db/index/PerRowSecondaryIndexTest.java  | 59 +---
 5 files changed, 124 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5009ee31/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e2cc92b..6ba5e7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Add support for custom 2i validation (CASSANDRA-7575)
  * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
  * Add listen_interface and rpc_interface options (CASSANDRA-7417)
  * Improve schema merge performance (CASSANDRA-7444)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5009ee31/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index e4ef0a8..45dd77e 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.*;
+import org.apache.cassandra.db.index.SecondaryIndexManager;
 import org.apache.cassandra.db.marshal.*;
 import org.apache.cassandra.dht.*;
 import org.apache.cassandra.exceptions.*;
@@ -357,7 +358,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 if (filter == null)
 return null;
 
-ListIndexExpression expressions = getIndexExpressions(options);
+ListIndexExpression expressions = 
getValidatedIndexExpressions(options);
 // The LIMIT provided by the user is the number of CQL row he wants 
returned.
 // We want to have getRangeSlice to count the number of columns, not 
the number of keys.
 AbstractBoundsRowPosition keyBounds = getKeyBounds(options);
@@ -1012,7 +1013,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 return buildBound(b, cfm.clusteringColumns(), columnRestrictions, 
isReversed, cfm.comparator, options);
 }
 
-public ListIndexExpression getIndexExpressions(QueryOptions options) 
throws InvalidRequestException
+public ListIndexExpression getValidatedIndexExpressions(QueryOptions 
options) throws InvalidRequestException
 {
 if (!usesSecondaryIndexing || restrictedColumns.isEmpty())
 return Collections.emptyList();
@@ -1081,6 +1082,14 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 expressions.add(new IndexExpression(def.name.bytes, 
IndexExpression.Operator.EQ, value));
 }
 }
+
+if (usesSecondaryIndexing)
+{
+ColumnFamilyStore cfs = 
Keyspace.open(keyspace()).getColumnFamilyStore(columnFamily());
+SecondaryIndexManager secondaryIndexManager = cfs.indexManager;
+secondaryIndexManager.validateIndexSearchersForQuery(expressions);
+}
+
 return expressions;
 }
 
@@ -1858,7 +1867,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 // the static parts. But 1) we don't have an easy way to do that 
with 2i and 2) since we don't support index on static columns
 // so far, 2i means that you've restricted a non static column, so 
the query is somewhat non-sensical.
 if (stmt.selectsOnlyStaticColumns)
-throw new InvalidRequestException(Queries using 2ndary 
indexes don't support selecting only static 

[3/3] git commit: merge from 2.1

2014-08-04 Thread jbellis
merge from 2.1


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

Branch: refs/heads/trunk
Commit: f1b0c26a1537c8b9c48abc96ba0c972f4ddf5221
Parents: f47863e 5009ee3
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 07:35:07 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 07:35:07 2014 -0500

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 15 -
 .../db/index/SecondaryIndexManager.java | 47 
 .../db/index/SecondaryIndexSearcher.java| 12 
 .../db/index/PerRowSecondaryIndexTest.java  | 58 +++-
 5 files changed, 127 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1b0c26a/CHANGES.txt
--
diff --cc CHANGES.txt
index f175b34,6ba5e7a..99a8fed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,6 +1,23 @@@
 +3.0
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * Add support for custom 2i validation (CASSANDRA-7575)
   * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add duration mode to cassandra-stress (CASSANDRA-7468)
   * Add listen_interface and rpc_interface options (CASSANDRA-7417)
   * Improve schema merge performance (CASSANDRA-7444)
   * Adjust MT depth based on # of partition validating (CASSANDRA-5263)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1b0c26a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 3097099,c6a80ea..92fbf3a
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@@ -18,8 -18,11 +18,10 @@@
  package org.apache.cassandra.db.index;
  
  
+ import java.io.IOException;
  import java.nio.ByteBuffer;
  import java.util.Arrays;
 -import java.util.Collections;
+ import java.util.List;
  import java.util.Set;
  
  import org.junit.Before;
@@@ -29,22 -31,22 +31,32 @@@ import org.junit.Test
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.cql3.QueryProcessor;
+ import org.apache.cassandra.cql3.UntypedResultSet;
 -import org.apache.cassandra.db.*;
 -import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 +import org.apache.cassandra.db.Cell;
 +import org.apache.cassandra.db.ColumnFamily;
 +import org.apache.cassandra.db.ColumnFamilyStore;
 +import org.apache.cassandra.db.DecoratedKey;
++import org.apache.cassandra.db.IndexExpression;
 +import org.apache.cassandra.db.Mutation;
++import org.apache.cassandra.db.Row;
  import org.apache.cassandra.db.composites.CellName;
+ import org.apache.cassandra.db.filter.ExtendedFilter;
  import org.apache.cassandra.db.filter.QueryFilter;
 -import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  
--import static org.junit.Assert.*;
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
  
 -public class PerRowSecondaryIndexTest extends SchemaLoader
 +public class PerRowSecondaryIndexTest
  {
  
  // test that when index(key) is called on a PRSI index,



[2/3] git commit: Add support for custom 2i validation patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575

2014-08-04 Thread jbellis
Add support for custom 2i validation
patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575


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

Branch: refs/heads/trunk
Commit: 5009ee31b933fcc5843417fd65ab9ff91bb74e73
Parents: f302eb7
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 07:32:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 07:32:56 2014 -0500

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 15 -
 .../db/index/SecondaryIndexManager.java | 47 
 .../db/index/SecondaryIndexSearcher.java| 12 
 .../db/index/PerRowSecondaryIndexTest.java  | 59 +---
 5 files changed, 124 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5009ee31/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e2cc92b..6ba5e7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Add support for custom 2i validation (CASSANDRA-7575)
  * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
  * Add listen_interface and rpc_interface options (CASSANDRA-7417)
  * Improve schema merge performance (CASSANDRA-7444)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5009ee31/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index e4ef0a8..45dd77e 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.*;
+import org.apache.cassandra.db.index.SecondaryIndexManager;
 import org.apache.cassandra.db.marshal.*;
 import org.apache.cassandra.dht.*;
 import org.apache.cassandra.exceptions.*;
@@ -357,7 +358,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 if (filter == null)
 return null;
 
-ListIndexExpression expressions = getIndexExpressions(options);
+ListIndexExpression expressions = 
getValidatedIndexExpressions(options);
 // The LIMIT provided by the user is the number of CQL row he wants 
returned.
 // We want to have getRangeSlice to count the number of columns, not 
the number of keys.
 AbstractBoundsRowPosition keyBounds = getKeyBounds(options);
@@ -1012,7 +1013,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 return buildBound(b, cfm.clusteringColumns(), columnRestrictions, 
isReversed, cfm.comparator, options);
 }
 
-public ListIndexExpression getIndexExpressions(QueryOptions options) 
throws InvalidRequestException
+public ListIndexExpression getValidatedIndexExpressions(QueryOptions 
options) throws InvalidRequestException
 {
 if (!usesSecondaryIndexing || restrictedColumns.isEmpty())
 return Collections.emptyList();
@@ -1081,6 +1082,14 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 expressions.add(new IndexExpression(def.name.bytes, 
IndexExpression.Operator.EQ, value));
 }
 }
+
+if (usesSecondaryIndexing)
+{
+ColumnFamilyStore cfs = 
Keyspace.open(keyspace()).getColumnFamilyStore(columnFamily());
+SecondaryIndexManager secondaryIndexManager = cfs.indexManager;
+secondaryIndexManager.validateIndexSearchersForQuery(expressions);
+}
+
 return expressions;
 }
 
@@ -1858,7 +1867,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 // the static parts. But 1) we don't have an easy way to do that 
with 2i and 2) since we don't support index on static columns
 // so far, 2i means that you've restricted a non static column, so 
the query is somewhat non-sensical.
 if (stmt.selectsOnlyStaticColumns)
-throw new InvalidRequestException(Queries using 2ndary 
indexes don't support selecting only static columns);
+throw new InvalidRequestException(Queries using 2ndary 
indexes don't support selecting only static columns); 

[jira] [Commented] (CASSANDRA-7537) Updates and partition tombstones are not given the same timestamp in a CAS batch

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7537?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084602#comment-14084602
 ] 

Sylvain Lebresne commented on CASSANDRA-7537:
-

The reason is CASSANDRA-6069. I'll note that the point 2 of my 
[comment|https://issues.apache.org/jira/browse/CASSANDRA-6069?focusedCommentId=13774535page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13774535]
 at the time is not longer valid, we do support batch for CAS now.

It should be possible to change the code so that we preserve the same timestamp 
for every user mutation but still special case collection deletions as 
per-CASSANDRA-6069 but I don't see an easy way to not make it damn ugly. Is the 
current behaviour such a big problem in practice (given that you can't control 
the timestamps of a CAS operation anyway)?

 Updates and partition tombstones are not given the same timestamp in a CAS 
 batch
 

 Key: CASSANDRA-7537
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7537
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Nicolas Favre-Felix

 Create a table with one partition and 2 CQL rows:
 {code}
 CREATE TABLE t1 (
 k text,
 c text,
 v text,
 PRIMARY KEY(k,c)
 );
 BEGIN BATCH
 INSERT INTO t1 (k,c,v) VALUES ('x','1','1');
 INSERT INTO t1 (k,c,v) VALUES ('x','2','2');
 APPLY BATCH;
 {code}
 CAS-delete the full partition based on the expected value of a single column:
 {code}
 cqlsh:ks1 SELECT * FROM t1 WHERE k='x';
  k | c | v
 ---+---+---
  x | 1 | 1
  x | 2 | 2
 (2 rows)
 cqlsh:ks1 BEGIN BATCH
... UPDATE t1 SET v = '0' WHERE k = 'x' AND c = '1' IF v = '1';
... DELETE FROM t1 WHERE k = 'x';
... APPLY BATCH;
  [applied]
 ---
   True
 cqlsh:ks1 SELECT * FROM t1 WHERE k='x';
  k | c | v
 ---+---+---
  x | 1 | 0
 (1 rows)
 {code}
 sstable2json reports that the updated column has a timestamp 1 greater than 
 the partition delete:
 {code}
 {key: 78,metadata: {deletionInfo: 
 {markedForDeleteAt:1405097039224999,localDeletionTime:1405097039}},columns:
  [[1:v,0,1405097039225000]]}
 {code}
 All mutations in a CAS batch should be applied with the same timestamp.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7683) Always allow CREATE TABLE IF NOT EXISTS if it exists

2014-08-04 Thread Jack Krupansky (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084605#comment-14084605
 ] 

Jack Krupansky commented on CASSANDRA-7683:
---

bq.  I execute an `ALTER TABLE IF EXISTS`.

Ummm... there's no such command, at least in the CQL3 spec! I suspect that you 
simply meant CREATE TABLE IF NOT EXISTS.

Assumming that, I think the CQL3 spec suggests that you should indeed be able 
to do what you suggest - or the spec needs to be revised to specifically 
disallow it:

{code}
Attempting to create an already existing table will return an error unless the 
IF NOT EXISTS option is used. If it is used, the statement will be a no-op if 
the table already exists.
{code}

So, unless, somebody wants to propose changing that second sentence to If it 
is used, the statement will be a no-op if the table already exists, unless the 
user does not have CREATE permission, in which case the request will return an 
error the Wish should be considered reasonable.

Personally, this one seems to be in a very gray area - fielder's choice, flip a 
coin.

Maybe the proper argument to make here is that the user wishes to have a single 
script that can be used by a range of users and for completeness includes the 
CREATE TABLE so it can be used for initial as well as incremental operations. 
It that context it would make sense, but... I may be reading too much into the 
users' intentions!


 Always allow CREATE TABLE IF NOT EXISTS if it exists
 

 Key: CASSANDRA-7683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7683
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Jens Rantil
Priority: Minor

 Background: I have a table that I'd like to make sure exists when I boot up 
 my application. To make the life easier for our developers I execute an 
 `ALTER TABLE IF EXISTS`.
 In production I am using user based authorization and for security reasons 
 regular production users are not allowed to CREATE TABLEs.
 Problem: When a user without CREATE permission executes `ALTER TABLE IF 
 EXISTS` for a table that already exists, the command fails telling me the 
 user is not allowed to execute `CREATE TABLE`. It feels kinda ridiculous that 
 this fails when I'm not actually creating the table.
 Proposal: That the permission check only should be done if the table is only 
 actually to be created. 
 Workaround: Right now, I have a boolean that checks if in production and in 
 that case don't try to create the table. Another approach would be to 
 manually check if the table exists.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6066) LHF 2i performance improvements

2014-08-04 Thread Lyuben Todorov (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6066?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084607#comment-14084607
 ] 

Lyuben Todorov commented on CASSANDRA-6066:
---

bq. We should perform more aggressive paging over the index partition
[~iamaleksey] Can you elaborate a bit?  

As for fetching the rows from the base cf (and it's tables), as far as i can 
see a good starting point would be to try to work out if the list of 
{{SecondaryIndexSearcher}}s can be narrowed down to a single search (im talking 
about SecondaryIndexManager#search}}).

 LHF 2i performance improvements
 ---

 Key: CASSANDRA-6066
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6066
 Project: Cassandra
  Issue Type: Improvement
Reporter: Aleksey Yeschenko
Assignee: Lyuben Todorov
  Labels: performance
 Fix For: 2.1.1


 We should perform more aggressive paging over the index partition (costs us 
 nothing) and also fetch the rows from the base table in one slice query (at 
 least the ones belonging to the same partition).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7026) CQL:WHERE ... IN with full partition keys

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7026?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084612#comment-14084612
 ] 

Sylvain Lebresne commented on CASSANDRA-7026:
-

bq. This of course all assumes that an IN filter could be faster than a bunch 
of prepared statements

It's not in practice so I'm not sure it worth bothering with this (though if 
someone comes up with a patch and it's not too big, I have no particular 
supporting the syntax for convenience).

 CQL:WHERE ... IN with full partition keys
 -

 Key: CASSANDRA-7026
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7026
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Dan Hunt
Priority: Minor
  Labels: cql

 It would be handy to be able to pass in a list of fully qualified composite 
 partition keys in an IN filter to retrieve multiple distinct rows with a 
 single select.  Not entirely sure how that would work.  It looks like maybe 
 it could be done with the existing token() function, like:
 SELECT * FROM table WHERE token(keyPartA, keyPartB) IN (token(1, 1), token(4, 
 2))
 Though, I guess you'd also want some way to pass a list of tokens to a 
 prepared statement through the driver.  This of course all assumes that an IN 
 filter could be faster than a bunch of prepared statements, which might not 
 be true.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7563) UserType, TupleType and collections in UDFs

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7563:


Issue Type: Bug  (was: New Feature)

 UserType, TupleType and collections in UDFs
 ---

 Key: CASSANDRA-7563
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7563
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp

 * is Java Driver as a dependency required ?
 * is it possible to extract parts of the Java Driver for UDT/TT/coll support ?
 * CQL {{DROP TYPE}} must check UDFs
 * must check keyspace access permissions (if those exist)



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7563) UserType, TupleType and collections in UDFs

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7563?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084624#comment-14084624
 ] 

Sylvain Lebresne commented on CASSANDRA-7563:
-

I'm going to mark that a bug to emphasis that while I won't mind it too much 
if this is a separated commit of CASSANDRA-7395, I think we should *not* 
release CASSANDRA-7395 until we have this.

bq. is it possible to extract parts of the Java Driver for UDT/TT/coll support ?

We currently already include the java driver for hadoop and for stress so I 
wouldn't worry about that here. I'm happy to work on splitting the relevant 
part in the driver into a separate jar if this ever become a problem but It 
probably won't be one and is definitively not one today.

 UserType, TupleType and collections in UDFs
 ---

 Key: CASSANDRA-7563
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7563
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp

 * is Java Driver as a dependency required ?
 * is it possible to extract parts of the Java Driver for UDT/TT/coll support ?
 * CQL {{DROP TYPE}} must check UDFs
 * must check keyspace access permissions (if those exist)



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7384) Collect metrics on queries by consistency level

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7384?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084660#comment-14084660
 ] 

Sylvain Lebresne commented on CASSANDRA-7384:
-

It feels to me that such metrics would make as much sense (if not more) client 
side (where you can track whatever you want). And I tend to share Jonathan's 
skepticism that this is such a common need, so I would favour letting users do 
it client side if they need it.

 Collect metrics on queries by consistency level
 ---

 Key: CASSANDRA-7384
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7384
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Vishy Kasar
Assignee: sankalp kohli
Priority: Minor

 We had cases where cassandra client users thought that they were doing 
 queries at one consistency level but turned out to be not correct. It will be 
 good to collect metrics on number of queries done at various consistency 
 level on the server. See the equivalent JIRA on java driver: 
 https://datastax-oss.atlassian.net/browse/JAVA-354



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Created] (CASSANDRA-7684) flush makes rows invisible to cluster key equality query

2014-08-04 Thread Jonathan Halliday (JIRA)
Jonathan Halliday created CASSANDRA-7684:


 Summary: flush makes rows invisible to cluster key equality query
 Key: CASSANDRA-7684
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7684
 Project: Cassandra
  Issue Type: Bug
 Environment: 2.1.0.rc5
Reporter: Jonathan Halliday


{noformat}
CREATE KEYSPACE test WITH replication = {'class': 'SimpleStrategy', 
'replication_factor': 1 };
USE test;
CREATE TYPE point_t (x double, y double);
CREATE TABLE points (partitionkey int, b boolean static, clusteringkey point_t, 
PRIMARY KEY (partitionkey, clusteringkey) );
INSERT INTO points (partitionkey, clusteringkey) VALUES (1, 
{x:-104.992510,y:39.747652});
select * from points WHERE partitionkey=1 AND clusteringkey = 
{x:-104.992510,y:39.747652};
 partitionkey | clusteringkey   | b
--+-+--
1 | {x: -104.99, y: 39.748} | null
(1 rows)
cqlsh:test update points set b = true where partitionkey=1;
cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
{x:-104.992510,y:39.747652};
 partitionkey | clusteringkey   | b
--+-+--
1 | {x: -104.99, y: 39.748} | True
(1 rows)
{noformat}

// run bin/nodetool flush here

{noformat}
cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
{x:-104.992510,y:39.747652};
(0 rows)
cqlsh:test select * from points WHERE partitionkey=1;
 partitionkey | clusteringkey   | b
--+-+--
1 | {x: -104.99, y: 39.748} | True
(1 rows)
{noformat}

i.e. the data is not lost, it's just invisible when read from sstable, but 
visible when read from memtable.






--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7606) Add IF [NOT] EXISTS to CREATE/DROP trigger

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7606:


Priority: Minor  (was: Major)

 Add IF [NOT] EXISTS to CREATE/DROP trigger
 --

 Key: CASSANDRA-7606
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7606
 Project: Cassandra
  Issue Type: Improvement
Reporter: Robert Stupp
Priority: Minor
  Labels: cql
 Fix For: 2.1.1


 All CREATE/DROP statements support IF [NOT] EXISTS - except CREATE/DROP 
 trigger.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7606) Add IF [NOT] EXISTS to CREATE/DROP trigger

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7606:


Labels: cql  (was: )

 Add IF [NOT] EXISTS to CREATE/DROP trigger
 --

 Key: CASSANDRA-7606
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7606
 Project: Cassandra
  Issue Type: Improvement
Reporter: Robert Stupp
  Labels: cql
 Fix For: 2.1.1


 All CREATE/DROP statements support IF [NOT] EXISTS - except CREATE/DROP 
 trigger.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Comment Edited] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7669?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084685#comment-14084685
 ] 

Robert Stupp edited comment on CASSANDRA-7669 at 8/4/14 2:09 PM:
-

Yep. But currently -1 on the patch (since it's not IPv6 only - but illustrated 
the cause).


was (Author: snazy):
Yep. But currently -1 on the patch (since it's not IPv6 only).

 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 2.0.10, 2.1.1

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7684) flush makes rows invisible to cluster key equality query

2014-08-04 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-7684:
--

Assignee: Sylvain Lebresne

 flush makes rows invisible to cluster key equality query
 

 Key: CASSANDRA-7684
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7684
 Project: Cassandra
  Issue Type: Bug
 Environment: 2.1.0.rc5
Reporter: Jonathan Halliday
Assignee: Sylvain Lebresne

 {noformat}
 CREATE KEYSPACE test WITH replication = {'class': 'SimpleStrategy', 
 'replication_factor': 1 };
 USE test;
 CREATE TYPE point_t (x double, y double);
 CREATE TABLE points (partitionkey int, b boolean static, clusteringkey 
 point_t, PRIMARY KEY (partitionkey, clusteringkey) );
 INSERT INTO points (partitionkey, clusteringkey) VALUES (1, 
 {x:-104.992510,y:39.747652});
 select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | null
 (1 rows)
 cqlsh:test update points set b = true where partitionkey=1;
 cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | True
 (1 rows)
 {noformat}
 // run bin/nodetool flush here
 {noformat}
 cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
 (0 rows)
 cqlsh:test select * from points WHERE partitionkey=1;
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | True
 (1 rows)
 {noformat}
 i.e. the data is not lost, it's just invisible when read from sstable, but 
 visible when read from memtable.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7669?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084685#comment-14084685
 ] 

Robert Stupp commented on CASSANDRA-7669:
-

Yep. But currently -1 on the patch (since it's not IPv6 only).

 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 2.0.10, 2.1.1

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Comment Edited] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7669?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084685#comment-14084685
 ] 

Robert Stupp edited comment on CASSANDRA-7669 at 8/4/14 2:12 PM:
-

Yep. But currently -1 on the patch (since it's now IPv6 only - but illustrated 
the cause).


was (Author: snazy):
Yep. But currently -1 on the patch (since it's not IPv6 only - but illustrated 
the cause).

 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 2.0.10, 2.1.1

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7683) Always allow CREATE TABLE IF NOT EXISTS if it exists

2014-08-04 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084701#comment-14084701
 ] 

Jonathan Ellis commented on CASSANDRA-7683:
---

bq. if one doesn't have CREATE rights on the keyspace, they shouldn't be able 
to try execute the statement

+1

 Always allow CREATE TABLE IF NOT EXISTS if it exists
 

 Key: CASSANDRA-7683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7683
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Jens Rantil
Priority: Minor

 Background: I have a table that I'd like to make sure exists when I boot up 
 my application. To make the life easier for our developers I execute an 
 `ALTER TABLE IF EXISTS`.
 In production I am using user based authorization and for security reasons 
 regular production users are not allowed to CREATE TABLEs.
 Problem: When a user without CREATE permission executes `ALTER TABLE IF 
 EXISTS` for a table that already exists, the command fails telling me the 
 user is not allowed to execute `CREATE TABLE`. It feels kinda ridiculous that 
 this fails when I'm not actually creating the table.
 Proposal: That the permission check only should be done if the table is only 
 actually to be created. 
 Workaround: Right now, I have a boolean that checks if in production and in 
 that case don't try to create the table. Another approach would be to 
 manually check if the table exists.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7669?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084719#comment-14084719
 ] 

Robert Stupp commented on CASSANDRA-7669:
-

Sorry for the -1 - have to revert it to a +1!
Patch LGTM

Tested with {{nodetool netstats}} , {{nodetool -h 127.0.0.1 netstats}} , 
{{nodetool -h ::1 netstats}}


 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 2.0.10, 2.1.1

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Philip Thompson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084757#comment-14084757
 ] 

Philip Thompson commented on CASSANDRA-7678:


I don't think these changes are technically necessary. For one, we certainly 
are not currently using the datastax python driver you have linked. Work on 
that is being done as a part of CASSANDRA-6313. Additionally you'll note that 
git://github.com/pcmanus/python-cql.git is merely a clone of cassandra-dbapi2, 
and that the current instructions lead to checking out everything required.

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Assigned] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Philip Thompson (JIRA)

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

Philip Thompson reassigned CASSANDRA-7678:
--

Assignee: Philip Thompson

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084772#comment-14084772
 ] 

Robert Stupp commented on CASSANDRA-7678:
-

Yep - the dtests require {{cql}} module.

Problem is this:
* cassandra-dbapi2 website says: This driver has been deprecated. Please use 
python-driver https://github.com/datastax/python-driver instead.
* but python-driver only has a {{cassandra}} module - so {{cql}} module is 
missing
* i landed on Sylvain's clone by googl'ing for python cql module


 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Assigned] (CASSANDRA-6177) remove all sleeps in the dtests

2014-08-04 Thread Philip Thompson (JIRA)

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

Philip Thompson reassigned CASSANDRA-6177:
--

Assignee: Philip Thompson

 remove all sleeps in the dtests
 ---

 Key: CASSANDRA-6177
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6177
 Project: Cassandra
  Issue Type: Test
Reporter: Brandon Williams
Assignee: Philip Thompson

 The dtests use a ton of sleep calls for various things, most of which is 
 guessing if Cassandra has finished doing something or not.  Guessing is 
 problematic and shouldn't be necessary -- a prime example of this is creating 
 a ks or cf.  When done over cql, we sleep and hope it's done propagating, but 
 when done over thrift we actually check for schema agreement.  We should be 
 able to eliminate the sleeps and reliably detect when it's time for the next 
 step programmatically.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7653) Add role based access control to Cassandra

2014-08-04 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko updated CASSANDRA-7653:
-

Reviewer: Aleksey Yeschenko

 Add role based access control to Cassandra
 --

 Key: CASSANDRA-7653
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7653
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Mike Adamson
 Fix For: 3.0

 Attachments: 7653.patch


 The current authentication model supports granting permissions to individual 
 users. While this is OK for small or medium organizations wanting to 
 implement authorization, it does not work well in large organizations because 
 of the overhead of having to maintain the permissions for each user.
 Introducing roles into the authentication model would allow sets of 
 permissions to be controlled in one place as a role and then the role granted 
 to users. Roles should also be able to be granted to other roles to allow 
 hierarchical sets of permissions to be built up.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Philip Thompson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084774#comment-14084774
 ] 

Philip Thompson commented on CASSANDRA-7678:


Yes I realize the fact that cassandra-dbapi2 is deprecated. That does not 
change the fact that the 'master' branch of dtests uses it, and we cannot 
simply switch over to the Datastax driver trivially. Which is why we are 
working on CASSANDRA-6313. You'll notice that equivalent changes to what you 
recommended are in the 'python-driver' branch of dtests, which will be merged 
into master sometime shortly after C* 2.1 releases. The current README and 
INSTALL.md files accurately reflect what is needed to run dtests, as they 
currently stand. 

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7678:
---

Component/s: Tests

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7660) Indicate PK columns in prepared native protocol responses

2014-08-04 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7660:


Labels: protocolv4  (was: )

 Indicate PK columns in prepared native protocol responses
 ---

 Key: CASSANDRA-7660
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7660
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Tyler Hobbs
  Labels: protocolv4
 Fix For: 3.0


 Currently, when native protocol drivers prepare statements, they need to 
 check their internal representation of the schema to determine which, if any, 
 of the columns are part of the partition key.  If the native protocol 
 response indicated this, it would remove the drivers' dependency on having an 
 internal representation of the schema when preparing statements.
 This would need to go in the v4 protocol.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Created] (CASSANDRA-7685) Prepared marker for collections inside UDT do not handle null values

2014-08-04 Thread Olivier Michallat (JIRA)
Olivier Michallat created CASSANDRA-7685:


 Summary: Prepared marker for collections inside UDT do not handle 
null values
 Key: CASSANDRA-7685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7685
 Project: Cassandra
  Issue Type: Bug
Reporter: Olivier Michallat


The fix for CASSANDRA-7472 does not handle null values. The following causes an 
NPE to be thrown:

{code}
// CREATE TYPE phone (alias text, number text)
// CREATE TYPE address (street text, phones setphone)
// CREATE TABLE user (id int PRIMARY KEY, addr address)
PreparedStatement ps = session.prepare(INSERT INTO user (id, addr) VALUES (1, 
{ street: 'foo', phones: ? }));
BoundStatement bs = ps.bind().setSet(0, null);
session.execute(bs);
{code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-7661) org.apache.cassandra.utils.BitSetTest fails if you don't have /usr/share/dict/words

2014-08-04 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan resolved CASSANDRA-7661.


Resolution: Duplicate

 org.apache.cassandra.utils.BitSetTest fails if you don't have 
 /usr/share/dict/words
 ---

 Key: CASSANDRA-7661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7661
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Jeremiah Jordan
Priority: Trivial

 org.apache.cassandra.utils.WordGenerator used by BitSetTests just assumes you 
 have the file /usr/share/dict/words on your system.  If you don't it fails.  
 We probably shouldn't have unit tests depending on arbitrary external files.
 {noformat}
 [junit] Testsuite: org.apache.cassandra.utils.BitSetTest
 [junit] Tests run: 4, Failures: 0, Errors: 1, Time elapsed: 2.044 sec
 [junit]
 [junit] Testcase: compareBitSets(org.apache.cassandra.utils.BitSetTest):  
 Caused an ERROR
 [junit] java.io.FileNotFoundException: /usr/share/dict/words (No such 
 file or directory)
 [junit] java.lang.RuntimeException: java.io.FileNotFoundException: 
 /usr/share/dict/words (No such file or directory)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.reset(KeyGenerator.java:137)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.init(KeyGenerator.java:126)
 [junit]   at 
 org.apache.cassandra.utils.BitSetTest.compareBitSets(BitSetTest.java:50)
 [junit] Caused by: java.io.FileNotFoundException: /usr/share/dict/words 
 (No such file or directory)
 [junit]   at java.io.FileInputStream.open(Native Method)
 [junit]   at java.io.FileInputStream.init(FileInputStream.java:146)
 [junit]   at java.io.FileInputStream.init(FileInputStream.java:101)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.reset(KeyGenerator.java:135)
 [junit]
 [junit]
 [junit] Test org.apache.cassandra.utils.BitSetTest FAILED
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Brandon Williams (JIRA)

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

Brandon Williams resolved CASSANDRA-7678.
-

Resolution: Not a Problem

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Assigned] (CASSANDRA-7685) Prepared marker for collections inside UDT do not handle null values

2014-08-04 Thread Brandon Williams (JIRA)

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

Brandon Williams reassigned CASSANDRA-7685:
---

Assignee: Sylvain Lebresne

 Prepared marker for collections inside UDT do not handle null values
 

 Key: CASSANDRA-7685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7685
 Project: Cassandra
  Issue Type: Bug
Reporter: Olivier Michallat
Assignee: Sylvain Lebresne

 The fix for CASSANDRA-7472 does not handle null values. The following causes 
 an NPE to be thrown:
 {code}
 // CREATE TYPE phone (alias text, number text)
 // CREATE TYPE address (street text, phones setphone)
 // CREATE TABLE user (id int PRIMARY KEY, addr address)
 PreparedStatement ps = session.prepare(INSERT INTO user (id, addr) VALUES 
 (1, { street: 'foo', phones: ? }));
 BoundStatement bs = ps.bind().setSet(0, null);
 session.execute(bs);
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7661) org.apache.cassandra.utils.BitSetTest fails if you don't have /usr/share/dict/words

2014-08-04 Thread Jeremiah Jordan (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7661?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084785#comment-14084785
 ] 

Jeremiah Jordan commented on CASSANDRA-7661:


Looks like that fixes it for unix systems without /usr/share/dict/words as 
well.  So I think we can just close this as a dupe.  Not worth back porting to 
2.0.

 org.apache.cassandra.utils.BitSetTest fails if you don't have 
 /usr/share/dict/words
 ---

 Key: CASSANDRA-7661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7661
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Jeremiah Jordan
Priority: Trivial

 org.apache.cassandra.utils.WordGenerator used by BitSetTests just assumes you 
 have the file /usr/share/dict/words on your system.  If you don't it fails.  
 We probably shouldn't have unit tests depending on arbitrary external files.
 {noformat}
 [junit] Testsuite: org.apache.cassandra.utils.BitSetTest
 [junit] Tests run: 4, Failures: 0, Errors: 1, Time elapsed: 2.044 sec
 [junit]
 [junit] Testcase: compareBitSets(org.apache.cassandra.utils.BitSetTest):  
 Caused an ERROR
 [junit] java.io.FileNotFoundException: /usr/share/dict/words (No such 
 file or directory)
 [junit] java.lang.RuntimeException: java.io.FileNotFoundException: 
 /usr/share/dict/words (No such file or directory)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.reset(KeyGenerator.java:137)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.init(KeyGenerator.java:126)
 [junit]   at 
 org.apache.cassandra.utils.BitSetTest.compareBitSets(BitSetTest.java:50)
 [junit] Caused by: java.io.FileNotFoundException: /usr/share/dict/words 
 (No such file or directory)
 [junit]   at java.io.FileInputStream.open(Native Method)
 [junit]   at java.io.FileInputStream.init(FileInputStream.java:146)
 [junit]   at java.io.FileInputStream.init(FileInputStream.java:101)
 [junit]   at 
 org.apache.cassandra.utils.KeyGenerator$WordGenerator.reset(KeyGenerator.java:135)
 [junit]
 [junit]
 [junit] Test org.apache.cassandra.utils.BitSetTest FAILED
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7685) Prepared marker for collections inside UDT do not handle null values

2014-08-04 Thread Olivier Michallat (JIRA)

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

Olivier Michallat updated CASSANDRA-7685:
-

Attachment: 7685.txt

Attaching trivial patch.

 Prepared marker for collections inside UDT do not handle null values
 

 Key: CASSANDRA-7685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7685
 Project: Cassandra
  Issue Type: Bug
Reporter: Olivier Michallat
Assignee: Sylvain Lebresne
 Attachments: 7685.txt


 The fix for CASSANDRA-7472 does not handle null values. The following causes 
 an NPE to be thrown:
 {code}
 // CREATE TYPE phone (alias text, number text)
 // CREATE TYPE address (street text, phones setphone)
 // CREATE TABLE user (id int PRIMARY KEY, addr address)
 PreparedStatement ps = session.prepare(INSERT INTO user (id, addr) VALUES 
 (1, { street: 'foo', phones: ? }));
 BoundStatement bs = ps.bind().setSet(0, null);
 session.execute(bs);
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-7685) Prepared marker for collections inside UDT do not handle null values

2014-08-04 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7685:


Reviewer: Sylvain Lebresne

 Prepared marker for collections inside UDT do not handle null values
 

 Key: CASSANDRA-7685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7685
 Project: Cassandra
  Issue Type: Bug
Reporter: Olivier Michallat
Assignee: Olivier Michallat
 Fix For: 2.1.0

 Attachments: 7685.txt


 The fix for CASSANDRA-7472 does not handle null values. The following causes 
 an NPE to be thrown:
 {code}
 // CREATE TYPE phone (alias text, number text)
 // CREATE TYPE address (street text, phones setphone)
 // CREATE TABLE user (id int PRIMARY KEY, addr address)
 PreparedStatement ps = session.prepare(INSERT INTO user (id, addr) VALUES 
 (1, { street: 'foo', phones: ? }));
 BoundStatement bs = ps.bind().setSet(0, null);
 session.execute(bs);
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Assigned] (CASSANDRA-7685) Prepared marker for collections inside UDT do not handle null values

2014-08-04 Thread Brandon Williams (JIRA)

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

Brandon Williams reassigned CASSANDRA-7685:
---

Assignee: Olivier Michallat  (was: Sylvain Lebresne)

 Prepared marker for collections inside UDT do not handle null values
 

 Key: CASSANDRA-7685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7685
 Project: Cassandra
  Issue Type: Bug
Reporter: Olivier Michallat
Assignee: Olivier Michallat
 Fix For: 2.1.0

 Attachments: 7685.txt


 The fix for CASSANDRA-7472 does not handle null values. The following causes 
 an NPE to be thrown:
 {code}
 // CREATE TYPE phone (alias text, number text)
 // CREATE TYPE address (street text, phones setphone)
 // CREATE TABLE user (id int PRIMARY KEY, addr address)
 PreparedStatement ps = session.prepare(INSERT INTO user (id, addr) VALUES 
 (1, { street: 'foo', phones: ? }));
 BoundStatement bs = ps.bind().setSet(0, null);
 session.execute(bs);
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7678) dtest: Doc fixes

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084818#comment-14084818
 ] 

Robert Stupp commented on CASSANDRA-7678:
-

bq. will be merged into master sometime shortly after C* 2.1 releases
Ah - ok. I just got confused about deprecated - use python-diver and it did 
not work.

 dtest: Doc fixes
 

 Key: CASSANDRA-7678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7678
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Robert Stupp
Assignee: Philip Thompson
Priority: Minor
 Attachments: dtest-readme-install.txt


 Hm - not sure whether the report is correct here...
 README and INSTALL of dtest refer to an outdated link for cassandra module 
 and reference to cql module was missing.
 Patch attached - but please review



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7674) Add implicit casting of UDF arguments

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7674?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084833#comment-14084833
 ] 

Sylvain Lebresne commented on CASSANDRA-7674:
-

Not convinced we need something here.

Since CASSANDRA-6766 we have some notion of sub-typing, so if someone want to 
write just one method for all integers, it can use {{varint}} and both {{int}} 
and {{bigint}} will properly be handled.

Granted the current sub-typing relation is wary of the types internal 
representation so that {{int}} is not a subtype of {{bigint}} (though both are 
subtype of {{varint}}). The reasoning being that, imo, we shouldn't do 
automagical stuff with the data size in a database (it's arguably a personal 
opinion, but I kind of feel strongly about it).

 Add implicit casting of UDF arguments
 -

 Key: CASSANDRA-7674
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7674
 Project: Cassandra
  Issue Type: Improvement
Reporter: Robert Stupp

 Writing implementations for each possible combination of even most 
 primitive CQL types is waste of time and results in unclear code.
 E.g. a {{divide}} function should accept {{int, bigint, float, double}} for 
 the first and second paramter.
 Better if UDF implementation can automagically do some up-casting ({{int}} to 
 {{bigint}}, {{float}} to {{double}} etc).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Created] (CASSANDRA-7686) Add proxy authentication to PasswordAuthenticator

2014-08-04 Thread Mike Adamson (JIRA)
Mike Adamson created CASSANDRA-7686:
---

 Summary: Add proxy authentication to PasswordAuthenticator
 Key: CASSANDRA-7686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7686
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Mike Adamson
 Fix For: 3.0


The SASL plain text protocol supports the concept of an authorization ID that 
is used for any authorization requests during the authenticated session.
 
This authorization ID is (optionally) passed during the SASL exchange as part 
of the SASL plain text message. It is currently ignored by the 
PasswordAuthenticator.

This field is typically used by web applications to authenticate using a fixed 
set of authentication credentials but allow authorization of resources based 
another user id. It allows the application to authenticate users using their 
own authentication mechanism without having to store the users credentials to 
log into the downstream system.

It would be useful if the PasswordAuthenticator could use this field (if 
present) as the user id for the AuthenticatedUser instead of the authentication 
ID currently used.

This would need a mechanism to allow / deny one user to proxy to another and 
the ability to check whether proxying is allowed for a user / proxy pair.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6599) CQL updates should support column = column - { key1, key2, ... } syntax for removing map elements

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6599?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084849#comment-14084849
 ] 

Sylvain Lebresne commented on CASSANDRA-6599:
-

bq. I have a minor preference for simply allowing nulls as map values

I'm good adding nulls for map values though for the record, let me note that up 
until protocol v3 there is no way to serialize collections with nulls inside 
(so this won't be useful for v1/v2 drivers when using prepared statement). It's 
ok since this ticket is targeted at 2.1, again, just mentioning it for the 
record.

Though for what it's worth I wouldn't personally mind supporting the {{..map - 
\{2, 3\}...}} syntax either: yes, it's subtracting a set to a map, but it feel 
intuitive enough to me to not be confusing and I can see it as reasonable 
syntactic sugar. 

 CQL updates should support column = column - { key1, key2, ... } syntax for 
 removing map elements
 ---

 Key: CASSANDRA-6599
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6599
 Project: Cassandra
  Issue Type: Wish
Reporter: Gavin
Assignee: Benjamin Lerer
Priority: Minor
  Labels: cql
 Fix For: 2.1.1

 Attachments: 6599-proto.txt, CASSANDRA-6599.txt


 A variable number number of elements can be removed from lists and sets using 
 an update statement of the form update  set column=column - {} where 
   This syntax should also be supported for map columns.  This would be 
 especially useful for prepared statements (I know that you can use set 
 column[...] = null to remove items in an update statement, but that only 
 works for one element at a time).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7684) flush makes rows invisible to cluster key equality query

2014-08-04 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7684?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084854#comment-14084854
 ] 

Sylvain Lebresne commented on CASSANDRA-7684:
-

Have you checked in rc4 out of curiosity? Feels like it could be a regression 
from CASSANDRA-7651 or CASSANDRA-7593. I'll look in any case.

 flush makes rows invisible to cluster key equality query
 

 Key: CASSANDRA-7684
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7684
 Project: Cassandra
  Issue Type: Bug
 Environment: 2.1.0.rc5
Reporter: Jonathan Halliday
Assignee: Sylvain Lebresne

 {noformat}
 CREATE KEYSPACE test WITH replication = {'class': 'SimpleStrategy', 
 'replication_factor': 1 };
 USE test;
 CREATE TYPE point_t (x double, y double);
 CREATE TABLE points (partitionkey int, b boolean static, clusteringkey 
 point_t, PRIMARY KEY (partitionkey, clusteringkey) );
 INSERT INTO points (partitionkey, clusteringkey) VALUES (1, 
 {x:-104.992510,y:39.747652});
 select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | null
 (1 rows)
 cqlsh:test update points set b = true where partitionkey=1;
 cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | True
 (1 rows)
 {noformat}
 // run bin/nodetool flush here
 {noformat}
 cqlsh:test select * from points WHERE partitionkey=1 AND clusteringkey = 
 {x:-104.992510,y:39.747652};
 (0 rows)
 cqlsh:test select * from points WHERE partitionkey=1;
  partitionkey | clusteringkey   | b
 --+-+--
 1 | {x: -104.99, y: 39.748} | True
 (1 rows)
 {noformat}
 i.e. the data is not lost, it's just invisible when read from sstable, but 
 visible when read from memtable.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7283) Cassandra tar.gz builds should be pushed to a Maven repo

2014-08-04 Thread Clinton Kelly (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7283?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084863#comment-14084863
 ] 

Clinton Kelly commented on CASSANDRA-7283:
--

Sorry to have not updated this earlier.  This fix worked great for me---thanks!

 Cassandra tar.gz builds should be pushed to a Maven repo
 

 Key: CASSANDRA-7283
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7283
 Project: Cassandra
  Issue Type: Wish
  Components: Packaging
Reporter: Clinton Kelly
Priority: Minor

 Such a feature would allow folks to package a Cassandra build in an archive 
 created with the Maven assembly plugin.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7682) DefsTable.mergeSchemaInternal improvement

2014-08-04 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7682?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084872#comment-14084872
 ] 

Aleksey Yeschenko commented on CASSANDRA-7682:
--

[~snazy] we add it (serialized keyspace) because of CASSANDRA-5631. Now that 
you mention it, we should also be adding it to user type schema changes as 
well, for the same reason.

 DefsTable.mergeSchemaInternal improvement
 -

 Key: CASSANDRA-7682
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7682
 Project: Cassandra
  Issue Type: Improvement
Reporter: Robert Stupp
Assignee: Robert Stupp
 Fix For: 2.1.1, 3.0

 Attachments: 7682.txt, 7682v2.txt


 Attached patch only loads 
 {{system.schema_keyspaces/schema_columnfamilies/schema_usertypes}} if at 
 least one mutation targets such tables.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Created] (CASSANDRA-7687) cqlsh DESC CLUSTER fails retrieving ring information

2014-08-04 Thread Adam Holmberg (JIRA)
Adam Holmberg created CASSANDRA-7687:


 Summary: cqlsh DESC CLUSTER fails retrieving ring information
 Key: CASSANDRA-7687
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7687
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Adam Holmberg
Priority: Minor
 Fix For: 2.1.0
 Attachments: cqlsh_build_ks_meta.txt

Details: https://datastax-oss.atlassian.net/browse/PYTHON-111

Applies only to cqlsh using the datastax python-driver.

Patch attached.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7682) DefsTable.mergeSchemaInternal improvement

2014-08-04 Thread Robert Stupp (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7682?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084885#comment-14084885
 ] 

Robert Stupp commented on CASSANDRA-7682:
-

[~iamaleksey] Do you create a ticket for addSerializedKeyspace/UDT?

 DefsTable.mergeSchemaInternal improvement
 -

 Key: CASSANDRA-7682
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7682
 Project: Cassandra
  Issue Type: Improvement
Reporter: Robert Stupp
Assignee: Robert Stupp
 Fix For: 2.1.1, 3.0

 Attachments: 7682.txt, 7682v2.txt


 Attached patch only loads 
 {{system.schema_keyspaces/schema_columnfamilies/schema_usertypes}} if at 
 least one mutation targets such tables.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-7601) Data loss after nodetool taketoken

2014-08-04 Thread Philip Thompson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-7601?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14084892#comment-14084892
 ] 

Philip Thompson commented on CASSANDRA-7601:


The 1.2 patch left cassandra-shuffle.bat. in cassandra/bin/

 Data loss after nodetool taketoken
 --

 Key: CASSANDRA-7601
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7601
 Project: Cassandra
  Issue Type: Bug
  Components: Core, Tests
 Environment: Mac OSX Mavericks. Ubuntu 14.04
Reporter: Philip Thompson
Assignee: Brandon Williams
Priority: Minor
 Fix For: 1.2.19, 2.0.10, 2.1 rc5

 Attachments: 7601-1.2.txt, 7601-2.0.txt, 7601-2.1.txt, 
 consistent_bootstrap_test.py, taketoken.tar.gz


 The dtest 
 consistent_bootstrap_test.py:TestBootstrapConsistency.consistent_reads_after_relocate_test
  is failing on HEAD of the git branches 2.1 and 2.1.0.
 The test performs the following actions:
 - Create a cluster of 3 nodes
 - Create a keyspace with RF 2
 - Take node 3 down
 - Write 980 rows to node 2 with CL ONE
 - Flush node 2
 - Bring node 3 back up
 - Run nodetool taketoken on node 3 to transfer 80% of node 1's tokens to node 
 3
 - Check for data loss
 When the check for data loss is performed, only ~725 rows can be read via CL 
 ALL.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[06/21] git commit: merge from 1.2

2014-08-04 Thread jbellis
merge from 1.2


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

Branch: refs/heads/cassandra-2.1.0
Commit: afd8f51da28b0945229c72045b553282e5fff2c6
Parents: 63a1e98 4a9634a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:05 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:05 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd8f51d/CHANGES.txt
--
diff --cc CHANGES.txt
index 68d40b0,ed04b63..f3654f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,18 +1,72 @@@
 -1.2.19
 +2.0.10
 + * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove shuffle and taketoken (CASSANDRA-7601)
 + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
 + * Fix range merging when DES scores are zero (CASSANDRA-7535)
 + * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
 + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 +   operations to incorrect become full QUORUM (CASSANDRA-7345)
 + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
 + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Make sure high level sstables get compacted (CASSANDRA-7414)
 + * Fix AssertionError when using empty clustering columns and static columns
 +   (CASSANDRA-7455)
 + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
 + * Add option to disable STCS in L0 (CASSANDRA-6621)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 + * Backport CASSANDRA-6747 (CASSANDRA-7560)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +Merged from 1.2:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
   * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
   * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
   * Set correct stream ID on responses when non-Exception Throwables
 are thrown while handling native protocol messages (CASSANDRA-7470)
 - * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
  
  
 -1.2.18
 - * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
 - * Fix compilation with java 6 broke by CASSANDRA-7147
 -
 +2.0.9
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 + * Support 

[21/21] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 55e874f61b52b4a0bafe0271a7fa92983020a1c9
Parents: b77debf c47906d
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:56 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


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



[05/21] git commit: Support connecting to ipv6 jmx with nodetool patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669

2014-08-04 Thread jbellis
Support connecting to ipv6 jmx with nodetool
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669


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

Branch: refs/heads/trunk
Commit: 4a9634a31ea7bbdf3b6c0173a94e6ab3911bc989
Parents: 0dd39c6
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:02:19 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:02:19 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b60d1d9..ed04b63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,17 @@
 1.2.19
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
  * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
  * Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
 
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
 
+
 1.2.17
  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColumnFamily metrics (CASSANDRA-7273)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d2393ca..60f8137 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -60,7 +60,7 @@ import org.apache.cassandra.utils.SimpleCondition;
  */
 public class NodeProbe
 {
-private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi;
+private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi;
 private static final String ssObjName = 
org.apache.cassandra.db:type=StorageService;
 private static final int defaultPort = 7199;
 final String host;



[09/21] git commit: merge from 1.2

2014-08-04 Thread jbellis
merge from 1.2


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

Branch: refs/heads/cassandra-2.1
Commit: afd8f51da28b0945229c72045b553282e5fff2c6
Parents: 63a1e98 4a9634a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:05 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:05 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd8f51d/CHANGES.txt
--
diff --cc CHANGES.txt
index 68d40b0,ed04b63..f3654f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,18 +1,72 @@@
 -1.2.19
 +2.0.10
 + * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove shuffle and taketoken (CASSANDRA-7601)
 + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
 + * Fix range merging when DES scores are zero (CASSANDRA-7535)
 + * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
 + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 +   operations to incorrect become full QUORUM (CASSANDRA-7345)
 + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
 + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Make sure high level sstables get compacted (CASSANDRA-7414)
 + * Fix AssertionError when using empty clustering columns and static columns
 +   (CASSANDRA-7455)
 + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
 + * Add option to disable STCS in L0 (CASSANDRA-6621)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 + * Backport CASSANDRA-6747 (CASSANDRA-7560)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +Merged from 1.2:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
   * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
   * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
   * Set correct stream ID on responses when non-Exception Throwables
 are thrown while handling native protocol messages (CASSANDRA-7470)
 - * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
  
  
 -1.2.18
 - * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
 - * Fix compilation with java 6 broke by CASSANDRA-7147
 -
 +2.0.9
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 + * Support DISTINCT 

[16/21] git commit: fix CHANGES

2014-08-04 Thread jbellis
fix CHANGES


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

Branch: refs/heads/trunk
Commit: 4b57695ce0cb2094c194a22e5618b68ed5785516
Parents: 9415bb4
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:42 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:42 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b57695c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 48140fd..5033722 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -112,11 +112,6 @@ Merged from 2.0:
  * Backport CASSANDRA-6747 (CASSANDRA-7560)
  * Track max/min timestamps for range tombstones (CASSANDRA-7647)
  * Fix NPE when listing saved caches dir (CASSANDRA-7632)
-Merged from 1.2:
- * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
- * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
- * Set correct stream ID on responses when non-Exception Throwables
-   are thrown while handling native protocol messages (CASSANDRA-7470)
 
 
 2.0.9



[08/21] git commit: merge from 1.2

2014-08-04 Thread jbellis
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: afd8f51da28b0945229c72045b553282e5fff2c6
Parents: 63a1e98 4a9634a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:05 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:05 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd8f51d/CHANGES.txt
--
diff --cc CHANGES.txt
index 68d40b0,ed04b63..f3654f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,18 +1,72 @@@
 -1.2.19
 +2.0.10
 + * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove shuffle and taketoken (CASSANDRA-7601)
 + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
 + * Fix range merging when DES scores are zero (CASSANDRA-7535)
 + * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
 + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 +   operations to incorrect become full QUORUM (CASSANDRA-7345)
 + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
 + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Make sure high level sstables get compacted (CASSANDRA-7414)
 + * Fix AssertionError when using empty clustering columns and static columns
 +   (CASSANDRA-7455)
 + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
 + * Add option to disable STCS in L0 (CASSANDRA-6621)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 + * Backport CASSANDRA-6747 (CASSANDRA-7560)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +Merged from 1.2:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
   * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
   * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
   * Set correct stream ID on responses when non-Exception Throwables
 are thrown while handling native protocol messages (CASSANDRA-7470)
 - * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
  
  
 -1.2.18
 - * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
 - * Fix compilation with java 6 broke by CASSANDRA-7147
 -
 +2.0.9
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 + * Support DISTINCT 

[10/21] git commit: merge from 2.0

2014-08-04 Thread jbellis
merge from 2.0


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

Branch: refs/heads/cassandra-2.1
Commit: 9415bb46acd36a298fe2a91ba14ec09ec391dbbb
Parents: 520de13 afd8f51
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:59 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:59 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9415bb46/CHANGES.txt
--
diff --cc CHANGES.txt
index 0927a30,f3654f7..48140fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,11 +1,63 @@@
 -2.0.10
 - * Fix truncate to always flush (CASSANDRA-7511)
 +2.1.0-final
++Merged from 2.0:
++ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
++
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are 

[02/21] git commit: Support connecting to ipv6 jmx with nodetool patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669

2014-08-04 Thread jbellis
Support connecting to ipv6 jmx with nodetool
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669


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

Branch: refs/heads/cassandra-2.0
Commit: 4a9634a31ea7bbdf3b6c0173a94e6ab3911bc989
Parents: 0dd39c6
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:02:19 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:02:19 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b60d1d9..ed04b63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,17 @@
 1.2.19
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
  * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
  * Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
 
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
 
+
 1.2.17
  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColumnFamily metrics (CASSANDRA-7273)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d2393ca..60f8137 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -60,7 +60,7 @@ import org.apache.cassandra.utils.SimpleCondition;
  */
 public class NodeProbe
 {
-private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi;
+private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi;
 private static final String ssObjName = 
org.apache.cassandra.db:type=StorageService;
 private static final int defaultPort = 7199;
 final String host;



[20/21] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: c47906d7eca009c852d81301ede09b15810de3f8
Parents: d585592 4b57695
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:50 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:50 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


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



[04/21] git commit: Support connecting to ipv6 jmx with nodetool patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669

2014-08-04 Thread jbellis
Support connecting to ipv6 jmx with nodetool
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669


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

Branch: refs/heads/cassandra-2.1
Commit: 4a9634a31ea7bbdf3b6c0173a94e6ab3911bc989
Parents: 0dd39c6
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:02:19 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:02:19 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b60d1d9..ed04b63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,17 @@
 1.2.19
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
  * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
  * Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
 
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
 
+
 1.2.17
  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColumnFamily metrics (CASSANDRA-7273)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d2393ca..60f8137 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -60,7 +60,7 @@ import org.apache.cassandra.utils.SimpleCondition;
  */
 public class NodeProbe
 {
-private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi;
+private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi;
 private static final String ssObjName = 
org.apache.cassandra.db:type=StorageService;
 private static final int defaultPort = 7199;
 final String host;



[12/21] git commit: merge from 2.0

2014-08-04 Thread jbellis
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 9415bb46acd36a298fe2a91ba14ec09ec391dbbb
Parents: 520de13 afd8f51
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:59 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:59 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9415bb46/CHANGES.txt
--
diff --cc CHANGES.txt
index 0927a30,f3654f7..48140fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,11 +1,63 @@@
 -2.0.10
 - * Fix truncate to always flush (CASSANDRA-7511)
 +2.1.0-final
++Merged from 2.0:
++ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
++
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero 

[19/21] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: c47906d7eca009c852d81301ede09b15810de3f8
Parents: d585592 4b57695
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:50 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:50 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


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



[03/21] git commit: Support connecting to ipv6 jmx with nodetool patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669

2014-08-04 Thread jbellis
Support connecting to ipv6 jmx with nodetool
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669


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

Branch: refs/heads/cassandra-2.1.0
Commit: 4a9634a31ea7bbdf3b6c0173a94e6ab3911bc989
Parents: 0dd39c6
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:02:19 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:02:19 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b60d1d9..ed04b63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,17 @@
 1.2.19
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
  * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
  * Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
 
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
 
+
 1.2.17
  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColumnFamily metrics (CASSANDRA-7273)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d2393ca..60f8137 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -60,7 +60,7 @@ import org.apache.cassandra.utils.SimpleCondition;
  */
 public class NodeProbe
 {
-private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi;
+private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi;
 private static final String ssObjName = 
org.apache.cassandra.db:type=StorageService;
 private static final int defaultPort = 7199;
 final String host;



[13/21] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: d585592c70d9b38e18d15fb7f77c195526bf3808
Parents: 5009ee3 9415bb4
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:05:33 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:05:33 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d585592c/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ba5e7a,48140fd..92f077e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,7 +1,22 @@@
 +2.1.1
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +
 +
  2.1.0-final
+ Merged from 2.0:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
+ 
  
  2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)



[18/21] git commit: fix CHANGES

2014-08-04 Thread jbellis
fix CHANGES


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

Branch: refs/heads/cassandra-2.1
Commit: 4b57695ce0cb2094c194a22e5618b68ed5785516
Parents: 9415bb4
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:42 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:42 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b57695c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 48140fd..5033722 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -112,11 +112,6 @@ Merged from 2.0:
  * Backport CASSANDRA-6747 (CASSANDRA-7560)
  * Track max/min timestamps for range tombstones (CASSANDRA-7647)
  * Fix NPE when listing saved caches dir (CASSANDRA-7632)
-Merged from 1.2:
- * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
- * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
- * Set correct stream ID on responses when non-Exception Throwables
-   are thrown while handling native protocol messages (CASSANDRA-7470)
 
 
 2.0.9



[11/21] git commit: merge from 2.0

2014-08-04 Thread jbellis
merge from 2.0


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

Branch: refs/heads/cassandra-2.1.0
Commit: 9415bb46acd36a298fe2a91ba14ec09ec391dbbb
Parents: 520de13 afd8f51
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:59 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:59 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9415bb46/CHANGES.txt
--
diff --cc CHANGES.txt
index 0927a30,f3654f7..48140fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,11 +1,63 @@@
 -2.0.10
 - * Fix truncate to always flush (CASSANDRA-7511)
 +2.1.0-final
++Merged from 2.0:
++ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
++
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores 

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

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b77debfd4669e23289652a23b9d0a81f0edb9300
Parents: f1b0c26 d585592
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:05:40 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:05:40 2014 -0500

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


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

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



[14/21] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-04 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: d585592c70d9b38e18d15fb7f77c195526bf3808
Parents: 5009ee3 9415bb4
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:05:33 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:05:33 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d585592c/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ba5e7a,48140fd..92f077e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,7 +1,22 @@@
 +2.1.1
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +
 +
  2.1.0-final
+ Merged from 2.0:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
+ 
  
  2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)



[17/21] git commit: fix CHANGES

2014-08-04 Thread jbellis
fix CHANGES


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

Branch: refs/heads/cassandra-2.1.0
Commit: 4b57695ce0cb2094c194a22e5618b68ed5785516
Parents: 9415bb4
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:08:42 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:08:42 2014 -0500

--
 CHANGES.txt | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b57695c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 48140fd..5033722 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -112,11 +112,6 @@ Merged from 2.0:
  * Backport CASSANDRA-6747 (CASSANDRA-7560)
  * Track max/min timestamps for range tombstones (CASSANDRA-7647)
  * Fix NPE when listing saved caches dir (CASSANDRA-7632)
-Merged from 1.2:
- * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
- * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
- * Set correct stream ID on responses when non-Exception Throwables
-   are thrown while handling native protocol messages (CASSANDRA-7470)
 
 
 2.0.9



[07/21] git commit: merge from 1.2

2014-08-04 Thread jbellis
merge from 1.2


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

Branch: refs/heads/trunk
Commit: afd8f51da28b0945229c72045b553282e5fff2c6
Parents: 63a1e98 4a9634a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:03:05 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:03:05 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd8f51d/CHANGES.txt
--
diff --cc CHANGES.txt
index 68d40b0,ed04b63..f3654f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,18 +1,72 @@@
 -1.2.19
 +2.0.10
 + * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove shuffle and taketoken (CASSANDRA-7601)
 + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
 + * Fix range merging when DES scores are zero (CASSANDRA-7535)
 + * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
 + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 +   operations to incorrect become full QUORUM (CASSANDRA-7345)
 + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
 + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Make sure high level sstables get compacted (CASSANDRA-7414)
 + * Fix AssertionError when using empty clustering columns and static columns
 +   (CASSANDRA-7455)
 + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
 + * Add option to disable STCS in L0 (CASSANDRA-6621)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 + * Backport CASSANDRA-6747 (CASSANDRA-7560)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +Merged from 1.2:
+  * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
   * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
   * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
   * Set correct stream ID on responses when non-Exception Throwables
 are thrown while handling native protocol messages (CASSANDRA-7470)
 - * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
  
  
 -1.2.18
 - * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
 - * Fix compilation with java 6 broke by CASSANDRA-7147
 -
 +2.0.9
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 + * Support DISTINCT for 

[01/21] git commit: Support connecting to ipv6 jmx with nodetool patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669

2014-08-04 Thread jbellis
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 0dd39c6a5 - 4a9634a31
  refs/heads/cassandra-2.0 63a1e987f - afd8f51da
  refs/heads/cassandra-2.1 5009ee31b - c47906d7e
  refs/heads/cassandra-2.1.0 520de135f - 4b57695ce
  refs/heads/trunk f1b0c26a1 - 55e874f61


Support connecting to ipv6 jmx with nodetool
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7669


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

Branch: refs/heads/cassandra-1.2
Commit: 4a9634a31ea7bbdf3b6c0173a94e6ab3911bc989
Parents: 0dd39c6
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 4 12:02:19 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 4 12:02:19 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b60d1d9..ed04b63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,17 @@
 1.2.19
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
  * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
  * Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
 
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat 
(CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
 
+
 1.2.17
  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColumnFamily metrics (CASSANDRA-7273)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a9634a3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d2393ca..60f8137 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -60,7 +60,7 @@ import org.apache.cassandra.utils.SimpleCondition;
  */
 public class NodeProbe
 {
-private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi;
+private static final String fmtUrl = 
service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi;
 private static final String ssObjName = 
org.apache.cassandra.db:type=StorageService;
 private static final int defaultPort = 7199;
 final String host;



[jira] [Updated] (CASSANDRA-7669) nodetool fails to connect when ipv6 host is specified

2014-08-04 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-7669:
--

Fix Version/s: (was: 2.1.1)
   2.1.0
   1.2.19

 nodetool fails to connect when ipv6 host is specified
 -

 Key: CASSANDRA-7669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7669
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
 Environment: java version 1.7.0_65
 Java(TM) SE Runtime Environment (build 1.7.0_65-b17)
 Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04, mixed mode)
Reporter: Adam Holmberg
Assignee: Robert Stupp
Priority: Trivial
 Fix For: 1.2.19, 2.0.10, 2.1.0

 Attachments: nodetool_url_fmt.txt


 The NodeProbe fmtUrl does not account for ipv6 addresses specified for 
 'host'. 
 nodetool -h with ipv6 host address fails with cryptic error message
 Adding square brackets as in http://www.ietf.org/rfc/rfc3986.txt section 
 3.2.2 corrects this behavior. Patch attached.
 {code:title=Before}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command'.
 bin/nodetool -h 0::1 -p 7100 version
 nodetool: For input string: :1:7100
 See 'nodetool help' or 'nodetool help command’.
 {code}
 {code:title=After}
 aholmberg-rmbp15:cassandra-2.1.0-rc4 adamholmberg$ for h in localhost 
 127.0.0.1 ::1 0::1; do cmd=bin/nodetool -h $h -p 7100 version; echo $cmd; 
 eval $cmd; done
 bin/nodetool -h localhost -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 127.0.0.1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h ::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 bin/nodetool -h 0::1 -p 7100 version
 ReleaseVersion: 2.1.0-rc4-SNAPSHOT
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


  1   2   >