[jira] [Commented] (CASSANDRA-7844) Fetching a single static column requires scanning to the first live CQL row

2014-08-28 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-7844:
-

tl;dr use {{DISTINCT}} ({{SELECT DISTINCT next_id FROM friends WHERE 
user='user1'}}).

If you do a query like {{SELECT next_id FROM friends WHERE user='user1'}}, we 
will query the whole partition the same way we would do it if the partition key 
was the only thing selected (and you'll have to use {{DISTINCT}} in that case 
too to avoid it).  See CASSANDRA-7305 for background.

Now you may ask: ok, but I have a {{LIMIT 1}} in my query, so why does it scan 
the whole 6 tombstoned cells. Good question. That part lies in how we count row 
in {{SliceQueryFilter}}. Because cells are not grouped in CQL rows in the 
underlying storage engine, we have to decompose cell names and make sure we 
only count 1 for all the cells pertaining to the same CQL row. Since we only 
know that we've gathered all the cells of a particular CQL row when we get a 
cell from another CQL row, the stopping condition is {{columnCounter.live() > 
limit}}. In other words, with {{LIMIT 1}}, we stop as soon as we've seen the 
first cell of the 2nd live CQL row.  But tombstones don't count towards the 
live count, so if you have 1 live CQL row following by scores of tombstones, we 
will read all the tombstones, because they are not "the first cell of the 2nd 
*live* row". I'll note that all this is not related to static columns in any 
way. It would be possible to change the logic to make a difference between 
"I've started counting the Xth row but there may still have more cells for that 
CQL row to add" and "I've counted X row but I've seen a tombstone that don't 
belong to the Xth row so if my limit is X I'm done". That said, it would 
probably be a bit ugly, and that would force us to decompose the cell names of 
tombstones which we currently don't do, so while it would improve what is a 
fairly degenerate case (remember that the solution to the example given in this 
ticket is to use {{DISTINCT}}), it would add a small overhead in general. 
Overall, I'm tempted to leave things as they are: we're hoping to make the 
storage engine a bit more aware of CQL rows in the future, and that will 
probably make that kind of things go away without requiring ugly special casing.


> Fetching a single static column requires scanning to the first live CQL row
> ---
>
> Key: CASSANDRA-7844
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7844
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Nicolas Favre-Felix
>  Labels: perfomance
>
> Reading a single static column seems to do more work than needed, scanning 
> the partition until the first live CQL row before returning a value.
> As I understand, static columns are stored separately from clustered rows 
> (see CASSANDRA-6956 for an issue that arised from this storage model). 
> Nevertheless, Cassandra doesn't optimize for the case where only static 
> columns and partition key dimensions are retrieved.
> Selecting a static column on its own is possible:
> {code}
> > create table friends (user text, next_id int static, friend_id int, email 
> > text, primary key(user,friend_id));
> > insert into friends (user, next_id) values ('user1', 1);
> > select * from friends where user = 'user1';
>  user  | friend_id | next_id | email
> ---+---+-+---
>  user1 |  null |   1 |  null
> (1 rows)
> {code}
> Let's insert and delete some clustered data:
> {code}
> > insert into friends (user, next_id, friend_id, email) values ('user1', 2, 
> > 1, 'abc@foo');
> > insert into friends (user, next_id, friend_id, email) values ('user1', 3, 
> > 2, 'def@foo');
> > insert into friends (user, next_id, friend_id, email) values ('user1', 4, 
> > 3, 'ghi@foo');
> > select * from friends where user = 'user1';
>  user  | friend_id | next_id | email
> ---+---+-+-
>  user1 | 1 |   4 | abc@foo
>  user1 | 2 |   4 | def@foo
>  user1 | 3 |   4 | ghi@foo
> (3 rows)
> > delete from friends where user = 'user1' and friend_id = 1;
> > delete from friends where user = 'user1' and friend_id = 2;
> > delete from friends where user = 'user1' and friend_id = 3;
> {code}
> And then fetch the static column again:
> {code}
> > TRACING ON
> Now tracing requests.
> > select next_id from friends where user = 'user1' limit 1;
>  next_id
> -
>4
> (1 rows)
> Tracing session: 597cc970-2e27-11e4-932f-c551d8e65d14
>  activity  | 
> timestamp| source| source_elapsed
> -

[jira] [Updated] (CASSANDRA-7844) Fetching a single static column requires scanning to the first live CQL row

2014-08-28 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7844:


Priority: Minor  (was: Major)

> Fetching a single static column requires scanning to the first live CQL row
> ---
>
> Key: CASSANDRA-7844
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7844
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Nicolas Favre-Felix
>Priority: Minor
>  Labels: perfomance
>
> Reading a single static column seems to do more work than needed, scanning 
> the partition until the first live CQL row before returning a value.
> As I understand, static columns are stored separately from clustered rows 
> (see CASSANDRA-6956 for an issue that arised from this storage model). 
> Nevertheless, Cassandra doesn't optimize for the case where only static 
> columns and partition key dimensions are retrieved.
> Selecting a static column on its own is possible:
> {code}
> > create table friends (user text, next_id int static, friend_id int, email 
> > text, primary key(user,friend_id));
> > insert into friends (user, next_id) values ('user1', 1);
> > select * from friends where user = 'user1';
>  user  | friend_id | next_id | email
> ---+---+-+---
>  user1 |  null |   1 |  null
> (1 rows)
> {code}
> Let's insert and delete some clustered data:
> {code}
> > insert into friends (user, next_id, friend_id, email) values ('user1', 2, 
> > 1, 'abc@foo');
> > insert into friends (user, next_id, friend_id, email) values ('user1', 3, 
> > 2, 'def@foo');
> > insert into friends (user, next_id, friend_id, email) values ('user1', 4, 
> > 3, 'ghi@foo');
> > select * from friends where user = 'user1';
>  user  | friend_id | next_id | email
> ---+---+-+-
>  user1 | 1 |   4 | abc@foo
>  user1 | 2 |   4 | def@foo
>  user1 | 3 |   4 | ghi@foo
> (3 rows)
> > delete from friends where user = 'user1' and friend_id = 1;
> > delete from friends where user = 'user1' and friend_id = 2;
> > delete from friends where user = 'user1' and friend_id = 3;
> {code}
> And then fetch the static column again:
> {code}
> > TRACING ON
> Now tracing requests.
> > select next_id from friends where user = 'user1' limit 1;
>  next_id
> -
>4
> (1 rows)
> Tracing session: 597cc970-2e27-11e4-932f-c551d8e65d14
>  activity  | 
> timestamp| source| source_elapsed
> ---+--+---+
> execute_cql3_query | 
> 13:18:46,792 | 127.0.0.1 |  0
>  Parsing SELECT next_id from friends where user = 'user1' LIMIT 1; | 
> 13:18:46,792 | 127.0.0.1 | 59
>Preparing statement | 
> 13:18:46,792 | 127.0.0.1 |125
>Executing single-partition query on friends | 
> 13:18:46,792 | 127.0.0.1 |357
>   Acquiring sstable references | 
> 13:18:46,792 | 127.0.0.1 |369
>Merging memtable tombstones | 
> 13:18:46,792 | 127.0.0.1 |381
>  Skipped 0/0 non-slice-intersecting sstables, included 0 due to tombstones | 
> 13:18:46,792 | 127.0.0.1 |445
> Merging data from memtables and 0 sstables | 
> 13:18:46,792 | 127.0.0.1 |460
> Read 1 live and 6 tombstoned cells | 
> 13:18:46,792 | 127.0.0.1 |504
>   Request complete | 
> 13:18:46,792 | 127.0.0.1 |711
> {code}
> 
> 
> We went over tombstones instead of returning the static column immediately.
> Is this possibly related to CASSANDRA-7085?



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


[jira] [Updated] (CASSANDRA-7375) nodetool units wrong for streamthroughput

2014-08-28 Thread JIRA

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

Olve Sæther Hansen updated CASSANDRA-7375:
--

Attachment: cassandra-2.0.txt

> nodetool units wrong for streamthroughput
> -
>
> Key: CASSANDRA-7375
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7375
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Mike Heffner
>Priority: Minor
>  Labels: lhf
> Attachments: cassandra-2.0.txt
>
>
> Stream throughput is measured in megabits (Mbps) in cassandray.yaml:
> {code}
> # When unset, the default is 200 Mbps or 25 MB/s.
> # stream_throughput_outbound_megabits_per_sec: 200
> {code}
> However, the nodetool command uses the unit "MB/s" which implies 
> megabytes/sec:
>   getstreamthroughput- Print the MB/s throughput cap for streaming in the 
> system
>   setstreamthroughput   - Set the MB/s throughput cap for 
> streaming in the system, or 0 to disable throttling.
> $ nodetool getstreamthroughput
> Current stream throughput: 200 MB/s
> Fix references in nodetool to use Mbps



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


[jira] [Commented] (CASSANDRA-7159) sstablemetadata command should print some more stuff

2014-08-28 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-7159:
-

bq. About the min/max column names. Are you talking about the CFMetaData class 
and CellNameType comparator?

Yes

bq. Do I need to create one patch or can upload for min/max tokens and continue 
working on min/max column names?

You can upload separate patches if it makes sense, no problem.

> sstablemetadata command should print some more stuff
> 
>
> Key: CASSANDRA-7159
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7159
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Vladislav Sinjavin
>Priority: Trivial
>  Labels: lhf
>
> It would be nice if the sstablemetadata command printed out some more of the 
> stuff we track.  Like the Min/Max column names and the min/max token in the 
> file.



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


[jira] [Updated] (CASSANDRA-7801) A successful INSERT with CAS does not always store data in the DB after a DELETE

2014-08-28 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7801:


Attachment: 7801.txt

What I think happens is simply that the insert timestamp ends up not being 
bigger than the previous delete. Conditional operations have their own way to 
assigning timestamps that is completely separated from the "normal" mechanism. 
So nothing prevents an insert to get the same timestamp than a previous delete 
(or even a smaller one, if the system clock goes backward due to a ntp 
adjustment, but equal timestamps is enough (and much more likely) since deletes 
win over inserts for equal timestamps).

I haven't tested it but I suspect that if the delete uses {{IF EXISTS}} (so it 
goes through the paxos path), then the test will always pass. And in fact, in 
the general case of a multi-node cluster, using {{IF EXISTS}} is the *only* way 
to make this work reliably (the same way that if you try this test without 
conditions this kind of test will not be guaranteed to work in a multi-node 
cluster unless you manually provide strictly increasing timestamps, even at 
CL.ALL).

That said, it's possible to make this pass in the case the client sticks to a 
single node, by hooking both the standard and the paxos mechanism for timestamp 
assignments together. I'm attaching a patch that does this. It's a tad verbose 
because we need to pass the {{ClientState}} in many places we used not to, but 
the main changes are really just in {{StorageProxy.beingAndRepairPaxos}} and in 
{{ClientState}}. I'll note that I haven't tested it so if [~efrnman] and/or 
[~philipthompson] you guys could validate that I'm not on crack and it does fix 
our test cases, that would be great.

I will note however that I'm only mildly in favor of messing with something as 
critical as timestamp generation in the 2.0 branch: as said above, the only 
proper way to guarantee ordering of the operations in general is to use {{IF 
EXISTS}} for the delete and I think we can leave it to that, at least for 2.0.


> A successful INSERT with CAS does not always store data in the DB after a 
> DELETE
> 
>
> Key: CASSANDRA-7801
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7801
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
> Environment: PC with Windows 7 and on Linux installation.
> Have seen the fault on Cassandra 2.0.9 and Cassandra 2.1.0-rc5 
>Reporter: Martin Fransson
>Assignee: Sylvain Lebresne
> Attachments: 7801.txt, cas.zip
>
>
> When I run a loop with CQL statements to DELETE, INSERT with CAS and then a 
> GET.
> The INSERT opertion is successful (Applied), but no data is stored in the 
> database. I have checked the database manually after the test to verify that 
> the DB is empty.
> for (int i = 0; i < 1; ++i)
> {
> try
> {
> t.del();
> t.cas();
> t.select();
> }
> catch (Exception e)
> {
> System.err.println("i=" + i);
> e.printStackTrace();
> break;
> }
> }
> myCluster = 
> Cluster.builder().addContactPoint("localhost").withPort(12742).build();
> mySession = myCluster.connect();
> mySession.execute("CREATE KEYSPACE IF NOT EXISTS castest WITH 
> REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");
> mySession.execute("CREATE TABLE IF NOT EXISTS castest.users (userid 
> text PRIMARY KEY, name text)");
> myInsert = mySession.prepare("INSERT INTO castest.users (userid, 
> name) values ('user1', 'calle') IF NOT EXISTS");
> myDelete = mySession.prepare("DELETE FROM castest.users where 
> userid='user1'");
> myGet = mySession.prepare("SELECT * FROM castest.users where 
> userid='user1'");
> }
> I can reproduce the fault with the attached program on a PC with windows 7.
> You need a cassandra runing and you need to set the port in the program.



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


[jira] [Updated] (CASSANDRA-7016) can't map/reduce over subset of rows with cql

2014-08-28 Thread Benjamin Lerer (JIRA)

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

Benjamin Lerer updated CASSANDRA-7016:
--

Attachment: CASSANDRA-7016-V3.txt

The patch fix the previously mentioned issues and fix also the fact that the 
previous solution was not working properly with partition key on multiple 
columns.


> can't map/reduce over subset of rows with cql
> -
>
> Key: CASSANDRA-7016
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7016
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core, Hadoop
>Reporter: Jonathan Halliday
>Assignee: Benjamin Lerer
>Priority: Minor
>  Labels: cql
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-7016-V2.txt, CASSANDRA-7016-V3.txt, 
> CASSANDRA-7016.txt
>
>
> select ... where token(k) < x and token(k) >= y and k in (a,b) allow 
> filtering;
> This fails on 2.0.6: can't restrict k by more than one relation.
> In the context of map/reduce (hence the token range) I want to map over only 
> a subset of the keys (hence the 'in').  Pushing the 'in' filter down to cql 
> is substantially cheaper than pulling all rows to the client and then 
> discarding most of them.
> Currently this is possible only if the hadoop integration code is altered to 
> apply the AND on the client side and use cql that contains only the resulting 
> filtered 'in' set.  The problem is not hadoop specific though, so IMO it 
> should really be solved in cql not the hadoop integration code.
> Most restrictions on cql syntax seem to exist to prevent unduly expensive 
> queries. This one seems to be doing the opposite.
> Edit: on further thought and with reference to the code in 
> SelectStatement$RawStatement, it seems to me that  token(k) and k should be 
> considered distinct entities for the purposes of processing restrictions. 
> That is, no restriction on the token should conflict with a restriction on 
> the raw key. That way any monolithic query in terms of k and be decomposed 
> into parallel chunks over the token range for the purposes of map/reduce 
> processing simply by appending a 'and where token(k)...' clause to the 
> exiting 'where k ...'.



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


[jira] [Updated] (CASSANDRA-7831) recreating a counter column after dropping it leaves in unusable state

2014-08-28 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7831:


Reviewer: Jonathan Ellis  (was: Sylvain Lebresne)

> recreating a counter column after dropping it leaves in unusable state
> --
>
> Key: CASSANDRA-7831
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7831
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Peter Mädel
>Assignee: Aleksey Yeschenko
> Fix For: 2.0.11, 2.1.0
>
> Attachments: 7831.txt
>
>
> create table counter_bug (t int, c counter, primary key (t));
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug ;
>  
>  t | c
> ---+---
>  1 | 1
>  
> (1 rows)
>  
> alter table counter_bug drop c;
> alter table counter_bug add c counter;
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug;
>  
> (0 rows)
> update counter_bug set c = c +1 where t = 2;
> select * from counter_bug;
>  
> (0 rows)



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


git commit: Forbid re-adding dropped counter columns

2014-08-28 Thread aleksey
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 0e272c233 -> 36ecc69cb


Forbid re-adding dropped counter columns

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831


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

Branch: refs/heads/cassandra-2.0
Commit: 36ecc69cbf3cc3734cf0602c60f101de95032a44
Parents: 0e272c2
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:30:23 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:31:07 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index abdd561..20874ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index dfcd601..698c8b8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -109,6 +109,10 @@ public class AlterTableStatement extends 
SchemaAlteringStatement
 }
 }
 
+// Cannot re-add a dropped counter column. See #7831.
+if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
+throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+
 AbstractType type = validator.getType();
 if (type instanceof CollectionType)
 {



[1/3] git commit: Add ability to detect unofficial openjdk builds.

2014-08-28 Thread aleksey
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 58c09cbd4 -> 69a25cd05


Add ability to detect unofficial openjdk builds.

Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799


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

Branch: refs/heads/cassandra-2.1.0
Commit: 0e272c233d050961fe79b94f333668b900d4fbbe
Parents: 29befa1
Author: Brandon Williams 
Authored: Wed Aug 27 10:08:18 2014 -0500
Committer: Brandon Williams 
Committed: Wed Aug 27 10:08:18 2014 -0500

--
 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e272c23/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c4c8bd5..3544426 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
 
 java_ver_output=`"${JAVA:-java}" -version 2>&1`
 
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 
{print $2}'`
+jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 
'NR==1 {print $2}'`
 JVM_VERSION=${jvmver%_*}
 JVM_PATCH_VERSION=${jvmver#*_}
 



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

2014-08-28 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-2.1.0
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:36:40 2014 +0300

--
 CHANGES.txt  | 1 +
 conf/cassandra-env.sh| 2 +-
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/CHANGES.txt
--
diff --cc CHANGES.txt
index 18c0a96,20874ac..d7a4536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.0.11:
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/conf/cassandra-env.sh
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index be28943,698c8b8..f286f31
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -108,6 -109,10 +108,10 @@@ public class AlterTableStatement extend
  }
  }
  
+ // Cannot re-add a dropped counter column. See #7831.
 -if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
++if (meta.isCounter() && 
meta.getDroppedColumns().containsKey(columnName))
+ throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+ 
  AbstractType type = validator.getType();
  if (type instanceof CollectionType)
  {



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

2014-08-28 Thread aleksey
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/7932119d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7932119d

Branch: refs/heads/cassandra-2.1
Commit: 7932119d1c1a300e52e80234a7c66cadc73b9e6a
Parents: d01250d 69a25cd
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:37:00 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:37:00 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--



[1/3] git commit: Forbid re-adding dropped counter columns

2014-08-28 Thread aleksey
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 d01250d63 -> 7932119d1


Forbid re-adding dropped counter columns

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831


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

Branch: refs/heads/cassandra-2.1
Commit: 36ecc69cbf3cc3734cf0602c60f101de95032a44
Parents: 0e272c2
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:30:23 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:31:07 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index abdd561..20874ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index dfcd601..698c8b8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -109,6 +109,10 @@ public class AlterTableStatement extends 
SchemaAlteringStatement
 }
 }
 
+// Cannot re-add a dropped counter column. See #7831.
+if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
+throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+
 AbstractType type = validator.getType();
 if (type instanceof CollectionType)
 {



[2/3] git commit: Forbid re-adding dropped counter columns

2014-08-28 Thread aleksey
Forbid re-adding dropped counter columns

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831


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

Branch: refs/heads/cassandra-2.1.0
Commit: 36ecc69cbf3cc3734cf0602c60f101de95032a44
Parents: 0e272c2
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:30:23 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:31:07 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index abdd561..20874ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index dfcd601..698c8b8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -109,6 +109,10 @@ public class AlterTableStatement extends 
SchemaAlteringStatement
 }
 }
 
+// Cannot re-add a dropped counter column. See #7831.
+if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
+throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+
 AbstractType type = validator.getType();
 if (type instanceof CollectionType)
 {



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

2014-08-28 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-2.1
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:36:40 2014 +0300

--
 CHANGES.txt  | 1 +
 conf/cassandra-env.sh| 2 +-
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/CHANGES.txt
--
diff --cc CHANGES.txt
index 18c0a96,20874ac..d7a4536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.0.11:
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/conf/cassandra-env.sh
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index be28943,698c8b8..f286f31
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -108,6 -109,10 +108,10 @@@ public class AlterTableStatement extend
  }
  }
  
+ // Cannot re-add a dropped counter column. See #7831.
 -if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
++if (meta.isCounter() && 
meta.getDroppedColumns().containsKey(columnName))
+ throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+ 
  AbstractType type = validator.getType();
  if (type instanceof CollectionType)
  {



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

2014-08-28 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:36:40 2014 +0300

--
 CHANGES.txt  | 1 +
 conf/cassandra-env.sh| 2 +-
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/CHANGES.txt
--
diff --cc CHANGES.txt
index 18c0a96,20874ac..d7a4536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.0.11:
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/conf/cassandra-env.sh
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index be28943,698c8b8..f286f31
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -108,6 -109,10 +108,10 @@@ public class AlterTableStatement extend
  }
  }
  
+ // Cannot re-add a dropped counter column. See #7831.
 -if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
++if (meta.isCounter() && 
meta.getDroppedColumns().containsKey(columnName))
+ throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+ 
  AbstractType type = validator.getType();
  if (type instanceof CollectionType)
  {



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

2014-08-28 Thread aleksey
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/2cc6313b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc6313b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc6313b

Branch: refs/heads/trunk
Commit: 2cc6313b8e3db4caf85606937000678f1a822e67
Parents: b317874 7932119
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:37:30 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:37:30 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc6313b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--



[1/4] git commit: Forbid re-adding dropped counter columns

2014-08-28 Thread aleksey
Repository: cassandra
Updated Branches:
  refs/heads/trunk b31787435 -> 2cc6313b8


Forbid re-adding dropped counter columns

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831


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

Branch: refs/heads/trunk
Commit: 36ecc69cbf3cc3734cf0602c60f101de95032a44
Parents: 0e272c2
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:30:23 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:31:07 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index abdd561..20874ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index dfcd601..698c8b8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -109,6 +109,10 @@ public class AlterTableStatement extends 
SchemaAlteringStatement
 }
 }
 
+// Cannot re-add a dropped counter column. See #7831.
+if (meta.getDefaultValidator().isCommutative() && 
meta.getDroppedColumns().containsKey(columnName.key))
+throw new InvalidRequestException(String.format("Cannot 
re-add previously dropped counter column %s", columnName));
+
 AbstractType type = validator.getType();
 if (type instanceof CollectionType)
 {



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

2014-08-28 Thread aleksey
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/7932119d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7932119d

Branch: refs/heads/trunk
Commit: 7932119d1c1a300e52e80234a7c66cadc73b9e6a
Parents: d01250d 69a25cd
Author: Aleksey Yeschenko 
Authored: Thu Aug 28 16:37:00 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Aug 28 16:37:00 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--



[jira] [Updated] (CASSANDRA-7831) recreating a counter column after dropping it leaves in unusable state

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7831:
---

Reproduced In: 2.0.10, 2.0.9  (was: 2.0.9, 2.0.10)
   Labels: qa-resolved  (was: )

> recreating a counter column after dropping it leaves in unusable state
> --
>
> Key: CASSANDRA-7831
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7831
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Peter Mädel
>Assignee: Aleksey Yeschenko
>  Labels: qa-resolved
> Fix For: 2.0.11, 2.1.0
>
> Attachments: 7831.txt
>
>
> create table counter_bug (t int, c counter, primary key (t));
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug ;
>  
>  t | c
> ---+---
>  1 | 1
>  
> (1 rows)
>  
> alter table counter_bug drop c;
> alter table counter_bug add c counter;
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug;
>  
> (0 rows)
> update counter_bug set c = c +1 where t = 2;
> select * from counter_bug;
>  
> (0 rows)



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


[jira] [Commented] (CASSANDRA-7831) recreating a counter column after dropping it leaves in unusable state

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson commented on CASSANDRA-7831:


Dtest for this behavior committed at 
https://github.com/riptano/cassandra-dtest/commit/18de5d7dd248e7632fb85993b54e94bcab79bff7
 . It is passing on 2.0 and 2.1 after Aleksey's commit.

> recreating a counter column after dropping it leaves in unusable state
> --
>
> Key: CASSANDRA-7831
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7831
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Peter Mädel
>Assignee: Aleksey Yeschenko
>  Labels: qa-resolved
> Fix For: 2.0.11, 2.1.0
>
> Attachments: 7831.txt
>
>
> create table counter_bug (t int, c counter, primary key (t));
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug ;
>  
>  t | c
> ---+---
>  1 | 1
>  
> (1 rows)
>  
> alter table counter_bug drop c;
> alter table counter_bug add c counter;
> update counter_bug set c = c +1 where t = 1;
> select * from counter_bug;
>  
> (0 rows)
> update counter_bug set c = c +1 where t = 2;
> select * from counter_bug;
>  
> (0 rows)



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


git commit: Update version number for 2.1.0-rc7

2014-08-28 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 69a25cd05 -> 35e4e7707


Update version number for 2.1.0-rc7


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

Branch: refs/heads/cassandra-2.1.0
Commit: 35e4e770719e383afb967153ad9ce9ce41e89c36
Parents: 69a25cd
Author: Sylvain Lebresne 
Authored: Thu Aug 28 16:33:05 2014 +0200
Committer: Sylvain Lebresne 
Committed: Thu Aug 28 16:33:05 2014 +0200

--
 CHANGES.txt  | 2 +-
 build.xml| 2 +-
 debian/changelog | 6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d7a4536..5eb5fd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.1.0
+2.1.0-rc7
  * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
  * Fix failure to stream ranges when moving (CASSANDRA-7836)
  * Correctly remove tmplink files (CASSANDRA-7803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/build.xml
--
diff --git a/build.xml b/build.xml
index 16ff03b..f2b6b4e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index e467737..3d63641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc7) unstable; urgency=medium
+
+  * New RC release
+
+ -- Sylvain Lebresne   Thu, 28 Aug 2014 16:32:12 +0200
+
 cassandra (2.1.0~rc6) unstable; urgency=medium
 
   * New RC release



Git Push Summary

2014-08-28 Thread slebresne
Repository: cassandra
Updated Tags:  refs/tags/2.1.0-rc7-tentative [created] 35e4e7707


[jira] [Updated] (CASSANDRA-7834) Case sensitivity problem in cqlsh when specifying keyspace in select

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7834:
---

Labels: lhf qa-resolved  (was: lhf)

> Case sensitivity problem in cqlsh when specifying keyspace in select
> 
>
> Key: CASSANDRA-7834
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7834
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: OSX and Ubuntu 14.04
>Reporter: Philip Thompson
>Assignee: Tyler Hobbs
>Priority: Minor
>  Labels: lhf, qa-resolved
> Fix For: 2.1.0
>
> Attachments: 7834-2.1.0.txt
>
>
> The dtest cqlsh_tests.py:TestCqlsh.test_with_empty_values is currently 
> failing. Upon investigation, the issue is a case sensitivity problem in 
> cqlsh. If I have a keyspace, 'cassandra', the following queries all work:
> {code}
> use cassandra;
> use CASSANDRA;
> select * from cassandra.table;
> {code}
> The following query worked in 2.0 but does not work in cqlsh in 2.1:
> {code}
> select * from CASSANDRA.table
> {code}
> It should be noted that the final query also works when accessing C* through 
> the python driver, so it should work in cqlsh.



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


[jira] [Updated] (CASSANDRA-7836) Data loss after moving tokens

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7836:
---

Labels: qa-resolved  (was: )

> Data loss after moving tokens
> -
>
> Key: CASSANDRA-7836
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7836
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
> Environment: OSX and Ubuntu 14.04
>Reporter: Philip Thompson
>Assignee: Tyler Hobbs
>Priority: Critical
>  Labels: qa-resolved
> Fix For: 2.1.0
>
> Attachments: 7863-2.1.0.txt, topology_test.py
>
>
> The dtest topology_test:TestTopology.movement_test is failing on 2.1.0 and 
> 2.1-HEAD. The test, which has been attached, goes through the following 
> workflow:
> - Create an unbalanced three node cluster without vnodes
> - Create a keyspace with RF=1
> - Load data into the cluster
> - Flush the cluster with nodetool flush
> - Move the tokens around to balance the cluster, using nodetool move
> - Run nodetool cleanup
> At this point, the test checks that all 10,000 of the originally inserted 
> rows are still there. In 2.0.10 that is true, however in 2.1, only ~4000 rows 
> exist.



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


[jira] [Updated] (CASSANDRA-7437) Ensure writes have completed after dropping a table, before recycling commit log segments (CASSANDRA-7437)

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7437:
---

Labels: qa-resolved  (was: )

>  Ensure writes have completed after dropping a table, before recycling commit 
> log segments (CASSANDRA-7437)
> ---
>
> Key: CASSANDRA-7437
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7437
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Benedict
>Assignee: Benedict
>Priority: Minor
>  Labels: qa-resolved
> Fix For: 2.1.0
>
> Attachments: 7437.log, 7437.round2.txt, 7437_test.py
>
>
> I've noticed on unit test output that there are still assertions being raised 
> here, so I've taken a torch to the code path to make damned certain it cannot 
> happen in future 
> # We now wait for all running reads on a column family or writes on the 
> keyspace during a dropCf call
> # We wait for all appends to the prior commit log segments before recycling 
> them
> # We pass the list of dropped Cfs into the CL.forceRecycle call so that they 
> can be markedClean definitely after they have been marked finished
> # Finally, to prevent any possibility of this still happening causing any 
> negative consequences, I've suppressed the assertion in favour of an error 
> log message, as the assertion would break correct program flow for the drop 
> and potentially result in undefined behaviour
> -(in actuality there is the slightest possibility still of a race condition 
> on read of a secondary index that causes a repair driven write, but this is a 
> really tiny race window, as I force wait for all reads after unlinking the 
> CF, so it would have to be a read that grabbed the CFS reference before it 
> was dropped, but hadn't quite started its read op yet).- In fact this is also 
> safe, as these modifications all grab a write op from the Keyspace, which has 
> to happen before they get the CFS, and also because we drop the data before 
> waiting for reads to finish on the CFS.



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


git commit: Better err msg when condition is set on PK column

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 36ecc69cb -> e48e6f33a


Better err msg when condition is set on PK column

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-7804


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

Branch: refs/heads/cassandra-2.0
Commit: e48e6f33ab8f0f2259f3b7172698eb6b8bf74b23
Parents: 36ecc69
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:39:24 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:39:24 2014 -0500

--
 CHANGES.txt| 1 +
 .../apache/cassandra/cql3/statements/ModificationStatement.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 20874ac..5b52471 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Better error message when condition is set on PK column (CASSANDRA-7804)
  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 165dbc1..b214e76 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -815,7 +815,7 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case KEY_ALIAS:
 case COLUMN_ALIAS:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
+throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 case VALUE_ALIAS:
 case COLUMN_METADATA:
 case STATIC:



[1/2] git commit: Better err msg when condition is set on PK column

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 35e4e7707 -> b8be49b5e


Better err msg when condition is set on PK column

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-7804


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

Branch: refs/heads/cassandra-2.1.0
Commit: e48e6f33ab8f0f2259f3b7172698eb6b8bf74b23
Parents: 36ecc69
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:39:24 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:39:24 2014 -0500

--
 CHANGES.txt| 1 +
 .../apache/cassandra/cql3/statements/ModificationStatement.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 20874ac..5b52471 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Better error message when condition is set on PK column (CASSANDRA-7804)
  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 165dbc1..b214e76 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -815,7 +815,7 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case KEY_ALIAS:
 case COLUMN_ALIAS:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
+throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 case VALUE_ALIAS:
 case COLUMN_METADATA:
 case STATIC:



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

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1.0
Commit: b8be49b5e943b7f76cefc133f8945446c2433a59
Parents: 35e4e77 e48e6f3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:40:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:40:18 2014 -0500

--

--




[2/5] git commit: Better err msg when condition is set on PK column

2014-08-28 Thread tylerhobbs
Better err msg when condition is set on PK column

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-7804


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

Branch: refs/heads/cassandra-2.1
Commit: e48e6f33ab8f0f2259f3b7172698eb6b8bf74b23
Parents: 36ecc69
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:39:24 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:39:24 2014 -0500

--
 CHANGES.txt| 1 +
 .../apache/cassandra/cql3/statements/ModificationStatement.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 20874ac..5b52471 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Better error message when condition is set on PK column (CASSANDRA-7804)
  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 165dbc1..b214e76 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -815,7 +815,7 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case KEY_ALIAS:
 case COLUMN_ALIAS:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
+throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 case VALUE_ALIAS:
 case COLUMN_METADATA:
 case STATIC:



[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: b8be49b5e943b7f76cefc133f8945446c2433a59
Parents: 35e4e77 e48e6f3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:40:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:40:18 2014 -0500

--

--




[1/5] git commit: Update version number for 2.1.0-rc7

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 7932119d1 -> 9f208b085


Update version number for 2.1.0-rc7


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

Branch: refs/heads/cassandra-2.1
Commit: 35e4e770719e383afb967153ad9ce9ce41e89c36
Parents: 69a25cd
Author: Sylvain Lebresne 
Authored: Thu Aug 28 16:33:05 2014 +0200
Committer: Sylvain Lebresne 
Committed: Thu Aug 28 16:33:05 2014 +0200

--
 CHANGES.txt  | 2 +-
 build.xml| 2 +-
 debian/changelog | 6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d7a4536..5eb5fd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.1.0
+2.1.0-rc7
  * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
  * Fix failure to stream ranges when moving (CASSANDRA-7836)
  * Correctly remove tmplink files (CASSANDRA-7803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/build.xml
--
diff --git a/build.xml b/build.xml
index 16ff03b..f2b6b4e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index e467737..3d63641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc7) unstable; urgency=medium
+
+  * New RC release
+
+ -- Sylvain Lebresne   Thu, 28 Aug 2014 16:32:12 +0200
+
 cassandra (2.1.0~rc6) unstable; urgency=medium
 
   * New RC release



[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java


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

Branch: refs/heads/cassandra-2.1
Commit: f294ece8f1e2afd300be5544886d2ee265d90745
Parents: 7932119 e48e6f3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:47:39 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:47:39 2014 -0500

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294ece8/CHANGES.txt
--
diff --cc CHANGES.txt
index 6764c30,5b52471..30fcf27
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -2.0.11:
 +2.1.1
 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of 
partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * 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:
+  * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (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)
 +Merged from 1.2:
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
   * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()

http://git-wip-us.apache.org/repos/asf/c

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

2014-08-28 Thread tylerhobbs
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/9f208b08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f208b08
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f208b08

Branch: refs/heads/cassandra-2.1
Commit: 9f208b085626f37e7c1d9373d5624a531dce5be4
Parents: f294ece b8be49b
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:47:44 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:47:44 2014 -0500

--

--




[1/6] git commit: Update version number for 2.1.0-rc7

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk 2cc6313b8 -> 21827fac6


Update version number for 2.1.0-rc7


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

Branch: refs/heads/trunk
Commit: 35e4e770719e383afb967153ad9ce9ce41e89c36
Parents: 69a25cd
Author: Sylvain Lebresne 
Authored: Thu Aug 28 16:33:05 2014 +0200
Committer: Sylvain Lebresne 
Committed: Thu Aug 28 16:33:05 2014 +0200

--
 CHANGES.txt  | 2 +-
 build.xml| 2 +-
 debian/changelog | 6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d7a4536..5eb5fd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.1.0
+2.1.0-rc7
  * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
  * Fix failure to stream ranges when moving (CASSANDRA-7836)
  * Correctly remove tmplink files (CASSANDRA-7803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/build.xml
--
diff --git a/build.xml b/build.xml
index 16ff03b..f2b6b4e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e4e770/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index e467737..3d63641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc7) unstable; urgency=medium
+
+  * New RC release
+
+ -- Sylvain Lebresne   Thu, 28 Aug 2014 16:32:12 +0200
+
 cassandra (2.1.0~rc6) unstable; urgency=medium
 
   * New RC release



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

2014-08-28 Thread tylerhobbs
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/9f208b08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f208b08
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f208b08

Branch: refs/heads/trunk
Commit: 9f208b085626f37e7c1d9373d5624a531dce5be4
Parents: f294ece b8be49b
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:47:44 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:47:44 2014 -0500

--

--




[2/6] git commit: Better err msg when condition is set on PK column

2014-08-28 Thread tylerhobbs
Better err msg when condition is set on PK column

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-7804


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

Branch: refs/heads/trunk
Commit: e48e6f33ab8f0f2259f3b7172698eb6b8bf74b23
Parents: 36ecc69
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:39:24 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:39:24 2014 -0500

--
 CHANGES.txt| 1 +
 .../apache/cassandra/cql3/statements/ModificationStatement.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 20874ac..5b52471 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Better error message when condition is set on PK column (CASSANDRA-7804)
  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
  * Always reject inequality on the partition key without token()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48e6f33/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 165dbc1..b214e76 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -815,7 +815,7 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case KEY_ALIAS:
 case COLUMN_ALIAS:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
+throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 case VALUE_ALIAS:
 case COLUMN_METADATA:
 case STATIC:



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

2014-08-28 Thread tylerhobbs
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/21827fac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21827fac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21827fac

Branch: refs/heads/trunk
Commit: 21827fac6d534802b8c8120bccc68e5b15863a76
Parents: 2cc6313 9f208b0
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:48:21 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:48:21 2014 -0500

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 +
 2 files changed, 2 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21827fac/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--



[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java


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

Branch: refs/heads/trunk
Commit: f294ece8f1e2afd300be5544886d2ee265d90745
Parents: 7932119 e48e6f3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:47:39 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:47:39 2014 -0500

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294ece8/CHANGES.txt
--
diff --cc CHANGES.txt
index 6764c30,5b52471..30fcf27
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -2.0.11:
 +2.1.1
 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of 
partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * 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:
+  * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (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)
 +Merged from 1.2:
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
   * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()

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

[3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/trunk
Commit: b8be49b5e943b7f76cefc133f8945446c2433a59
Parents: 35e4e77 e48e6f3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:40:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:40:18 2014 -0500

--

--




git commit: Ninja: fix bad merge of CASSANDRA-7804

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 9f208b085 -> ed630e30e


Ninja: fix bad merge of CASSANDRA-7804


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

Branch: refs/heads/cassandra-2.1
Commit: ed630e30eee913b5b29d882c439c8d1741d223ff
Parents: 9f208b0
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:58:17 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:58:17 2014 -0500

--
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed630e30/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index d1d0c27..69d5472 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -748,7 +748,6 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case PARTITION_KEY:
 case CLUSTERING_COLUMN:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
 throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 default:
 stmt.addCondition(condition);



[1/2] git commit: Ninja: fix bad merge of CASSANDRA-7804

2014-08-28 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk 21827fac6 -> f2f2ee5bc


Ninja: fix bad merge of CASSANDRA-7804


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

Branch: refs/heads/trunk
Commit: ed630e30eee913b5b29d882c439c8d1741d223ff
Parents: 9f208b0
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:58:17 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:58:17 2014 -0500

--
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed630e30/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index d1d0c27..69d5472 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -748,7 +748,6 @@ public abstract class ModificationStatement implements 
CQLStatement, MeasurableF
 {
 case PARTITION_KEY:
 case CLUSTERING_COLUMN:
-throw new 
InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", 
entry.left));
 throw new 
InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF 
conditions", entry.left));
 default:
 stmt.addCondition(condition);



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

2014-08-28 Thread tylerhobbs
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/f2f2ee5b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2f2ee5b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2f2ee5b

Branch: refs/heads/trunk
Commit: f2f2ee5bcfd0e56abaae1235ed48ee58710179ce
Parents: 21827fa ed630e3
Author: Tyler Hobbs 
Authored: Thu Aug 28 10:59:47 2014 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 28 10:59:47 2014 -0500

--
 .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2f2ee5b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--



[jira] [Created] (CASSANDRA-7845) Negative load of C* nodes

2014-08-28 Thread Robert Stupp (JIRA)
Robert Stupp created CASSANDRA-7845:
---

 Summary: Negative load of C* nodes
 Key: CASSANDRA-7845
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7845
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp


I've completed two C* workshops. Both groups also did an upgrade of C* 2.0.9 to 
2.1.0rc6 in a 6 node multi-DC cluster.

Both groups encountered the same phenomenon that "nodetool status" and 
OpsCenter report a negative load (data size) of most (not all) nodes. I did not 
take the phenomenon seriously for the first group, because there were only 
operations guys that "did their best to crash the cluster". But the second 
groups did nothing seriously wrong.

2.0.9 configuration was the default one with just changed directories (data, 
cl, caches) and cluster name. Configurations of 2.1.0rc6 nodes matched the 
config of 2.0.9 - they just removed 5 config parameters that were removed in 
2.1. They did not run any repair or forced a compaction.

After a rolling restart both "nodetool status" and OpsCenter report the correct 
load.

I was not able to reproduce this locally.

I have a third group tomorrow and hope to have some time to do the upgrade 
again. Anything that I can check? I think it would be possible to grab the data 
files from at least one node for further analysis. Anything else I can do to 
check that?



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


[jira] [Resolved] (CASSANDRA-7845) Negative load of C* nodes

2014-08-28 Thread Brandon Williams (JIRA)

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

Brandon Williams resolved CASSANDRA-7845.
-

Resolution: Duplicate

Closing as a dupe, but as you can see we haven't made much progress there 
either.  If we can get a solid way to reproduce that would be the most benefit.

> Negative load of C* nodes
> -
>
> Key: CASSANDRA-7845
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7845
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>
> I've completed two C* workshops. Both groups also did an upgrade of C* 2.0.9 
> to 2.1.0rc6 in a 6 node multi-DC cluster.
> Both groups encountered the same phenomenon that "nodetool status" and 
> OpsCenter report a negative load (data size) of most (not all) nodes. I did 
> not take the phenomenon seriously for the first group, because there were 
> only operations guys that "did their best to crash the cluster". But the 
> second groups did nothing seriously wrong.
> 2.0.9 configuration was the default one with just changed directories (data, 
> cl, caches) and cluster name. Configurations of 2.1.0rc6 nodes matched the 
> config of 2.0.9 - they just removed 5 config parameters that were removed in 
> 2.1. They did not run any repair or forced a compaction.
> After a rolling restart both "nodetool status" and OpsCenter report the 
> correct load.
> I was not able to reproduce this locally.
> I have a third group tomorrow and hope to have some time to do the upgrade 
> again. Anything that I can check? I think it would be possible to grab the 
> data files from at least one node for further analysis. Anything else I can 
> do to check that?



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


[jira] [Commented] (CASSANDRA-7845) Negative load of C* nodes

2014-08-28 Thread Robert Stupp (JIRA)

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

Robert Stupp commented on CASSANDRA-7845:
-

Will do the upgrade again - but with data/cl/sc/cfg backed up before and after 
the upgrade to be able to reproduce it. Maybe it's reproducible on a single 
node with data from one of the "failing" nodes. We did not see any data loss - 
just these strange load numbers.

> Negative load of C* nodes
> -
>
> Key: CASSANDRA-7845
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7845
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>
> I've completed two C* workshops. Both groups also did an upgrade of C* 2.0.9 
> to 2.1.0rc6 in a 6 node multi-DC cluster.
> Both groups encountered the same phenomenon that "nodetool status" and 
> OpsCenter report a negative load (data size) of most (not all) nodes. I did 
> not take the phenomenon seriously for the first group, because there were 
> only operations guys that "did their best to crash the cluster". But the 
> second groups did nothing seriously wrong.
> 2.0.9 configuration was the default one with just changed directories (data, 
> cl, caches) and cluster name. Configurations of 2.1.0rc6 nodes matched the 
> config of 2.0.9 - they just removed 5 config parameters that were removed in 
> 2.1. They did not run any repair or forced a compaction.
> After a rolling restart both "nodetool status" and OpsCenter report the 
> correct load.
> I was not able to reproduce this locally.
> I have a third group tomorrow and hope to have some time to do the upgrade 
> again. Anything that I can check? I think it would be possible to grab the 
> data files from at least one node for further analysis. Anything else I can 
> do to check that?



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


[jira] [Commented] (CASSANDRA-7845) Negative load of C* nodes

2014-08-28 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7845:
-

The problem with restoring is it still may not manifest, since restarting fixes 
it :(

> Negative load of C* nodes
> -
>
> Key: CASSANDRA-7845
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7845
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>
> I've completed two C* workshops. Both groups also did an upgrade of C* 2.0.9 
> to 2.1.0rc6 in a 6 node multi-DC cluster.
> Both groups encountered the same phenomenon that "nodetool status" and 
> OpsCenter report a negative load (data size) of most (not all) nodes. I did 
> not take the phenomenon seriously for the first group, because there were 
> only operations guys that "did their best to crash the cluster". But the 
> second groups did nothing seriously wrong.
> 2.0.9 configuration was the default one with just changed directories (data, 
> cl, caches) and cluster name. Configurations of 2.1.0rc6 nodes matched the 
> config of 2.0.9 - they just removed 5 config parameters that were removed in 
> 2.1. They did not run any repair or forced a compaction.
> After a rolling restart both "nodetool status" and OpsCenter report the 
> correct load.
> I was not able to reproduce this locally.
> I have a third group tomorrow and hope to have some time to do the upgrade 
> again. Anything that I can check? I think it would be possible to grab the 
> data files from at least one node for further analysis. Anything else I can 
> do to check that?



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


[jira] [Created] (CASSANDRA-7846) Archive Commitlog Tests Failings

2014-08-28 Thread Philip Thompson (JIRA)
Philip Thompson created CASSANDRA-7846:
--

 Summary: Archive Commitlog Tests Failings
 Key: CASSANDRA-7846
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7846
 Project: Cassandra
  Issue Type: Bug
 Environment: OSX and Ubuntu 14.04
Reporter: Philip Thompson


Four of the snapshot_test.py:TestArchiveCommitlog tests are failing on 2.1.0 
and 2.1-HEAD:
http://cassci.datastax.com/job/cassandra-2.1.0_dtest/lastCompletedBuild/testReport/snapshot_test/

The tests restore archived commit logs and check how many rows exist after 
restoring. They are passing on 2.0-HEAD.



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


[jira] [Updated] (CASSANDRA-7846) Archive Commitlog Tests Failings

2014-08-28 Thread Philip Thompson (JIRA)

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

Philip Thompson updated CASSANDRA-7846:
---

Tester: Philip Thompson

> Archive Commitlog Tests Failings
> 
>
> Key: CASSANDRA-7846
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7846
> Project: Cassandra
>  Issue Type: Bug
> Environment: OSX and Ubuntu 14.04
>Reporter: Philip Thompson
>
> Four of the snapshot_test.py:TestArchiveCommitlog tests are failing on 2.1.0 
> and 2.1-HEAD:
> http://cassci.datastax.com/job/cassandra-2.1.0_dtest/lastCompletedBuild/testReport/snapshot_test/
> The tests restore archived commit logs and check how many rows exist after 
> restoring. They are passing on 2.0-HEAD.



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


[jira] [Commented] (CASSANDRA-7239) Nodetool Status Reports Negative Load With VNodes Disabled

2014-08-28 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7239:
-

Here's one way to repro fairly easily: stick an assert/throw in 
org.apache.cassandra.db.DataTracker.spaceReclaimed after it decrements, then do 
some stress inserts.  Took around 4M for me to trigger it:

{noformat}
INFO  19:26:13 Enqueuing flush of Standard1: 87030528 (33%) on-heap, 0 (0%) 
off-heap
INFO  19:26:13 Writing Memtable-Standard1@1502715954(24933920 serialized bytes, 
566680 ops, 33%/0% of on/off-heap limit)
INFO  19:26:15 Completed flushing 
/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-14-Data.db
 (31847416 bytes) for commitlog position 
ReplayPosition(segmentId=1409253765886, position=18443872)
INFO  19:26:15 Enqueuing flush of compactions_in_progress: 1334 (0%) on-heap, 0 
(0%) off-heap
INFO  19:26:15 Writing Memtable-compactions_in_progress@1683103686(144 
serialized bytes, 9 ops, 0%/0% of on/off-heap limit)
INFO  19:26:15 Completed flushing 
/var/lib/cassandra/data/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/system-compactions_in_progress-ka-6-Data.db
 (167 bytes) for commitlog position ReplayPosition(segmentId=1409253765887, 
position=857003)
INFO  19:26:15 Compacting 
[SSTableReader(path='/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-12-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-13-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-11-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-14-Data.db')]
INFO  19:26:18 Enqueuing flush of Standard1: 87028992 (33%) on-heap, 0 (0%) 
off-heap
INFO  19:26:18 Writing Memtable-Standard1@1478442071(24930840 serialized bytes, 
566610 ops, 33%/0% of on/off-heap limit)
INFO  19:26:20 Completed flushing 
/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-16-Data.db
 (31843482 bytes) for commitlog position 
ReplayPosition(segmentId=1409253765887, position=21153003)
INFO  19:26:23 Enqueuing flush of Standard1: 87039744 (33%) on-heap, 0 (0%) 
off-heap
INFO  19:26:23 Writing Memtable-Standard1@708372436(24935900 serialized bytes, 
566725 ops, 33%/0% of on/off-heap limit)
INFO  19:26:25 Completed flushing 
/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-17-Data.db
 (31849945 bytes) for commitlog position 
ReplayPosition(segmentId=1409253765888, position=23869152)
INFO  19:26:28 Enqueuing flush of Standard1: 87031296 (33%) on-heap, 0 (0%) 
off-heap
INFO  19:26:28 Writing Memtable-Standard1@1583340894(24930840 serialized bytes, 
566610 ops, 33%/0% of on/off-heap limit)
INFO  19:26:29 Enqueuing flush of compactions_in_progress: 180 (0%) on-heap, 0 
(0%) off-heap
INFO  19:26:29 Writing Memtable-compactions_in_progress@145401(0 serialized 
bytes, 1 ops, 0%/0% of on/off-heap limit)
INFO  19:26:29 Completed flushing 
/var/lib/cassandra/data/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/system-compactions_in_progress-ka-7-Data.db
 (42 bytes) for commitlog position ReplayPosition(segmentId=1409253765890, 
position=1491303)
INFO  19:26:30 Completed flushing 
/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-18-Data.db
 (31843482 bytes) for commitlog position 
ReplayPosition(segmentId=1409253765889, position=26577952)
INFO  19:26:30 Compacted 4 sstables to 
[/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-15,].
  127,390,788 bytes to 127,390,788 (~100% of original) in 15,199ms = 
7.993244MB/s.  453,348 total partitions merged to 453,348.  Partition merge 
counts were {1:453348, }
INFO  19:26:33 Enqueuing flush of Standard1: 87026688 (33%) on-heap, 0 (0%) 
off-heap
INFO  19:26:33 Writing Memtable-Standard1@159807468(24931940 serialized bytes, 
566635 ops, 33%/0% of on/off-heap limit)
INFO  19:26:34 Completed flushing 
/var/lib/cassandra/data/Keyspace1/Standard1-b8aa5ae02ee811e4a834517bcdb23258/Keyspace1-Standard1-ka-19-Data.db
 (31844887 bytes) for commitlog position 
ReplayPosition(segmentId=1409253765890, position=29289191)
INFO  19:26:34 Enqueuing flush of compactions_in_progress: 1334 (0%) on-heap, 0 
(0%) off-heap
INFO  19:26:34 Writing Memtable-compactions_in_progress@1430076737(144 
serialized bytes, 9 ops, 0%/0% of on/off-heap limit)
INFO  19:26:34 Completed flushing 
/var/lib/cassandra/data/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/system-compactions_in_progress-ka-8-Data.db
 (

[jira] [Commented] (CASSANDRA-7523) add date and time types

2014-08-28 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie commented on CASSANDRA-7523:


Testing 2 tables w/mirrored inserts, compression enabled, 1 w/5 bigint per row 
and 1 w/5 nanotime (6 byte underlying type) per row at 10M inserts (after 
forced flush and major compaction to a single file):

{noformat}
 12915616 timetest-longtest-ka-37-Filter.db
22044 timetest-longtest-ka-37-Index.db
238827449 timetest-longtest-ka-37-Data.db
   105230 timetest-longtest-ka-37-CompressionInfo.db
 9991 timetest-longtest-ka-37-Statistics.db
  1565712 timetest-longtest-ka-37-Summary.db

 12230912 timetest-timetest-ka-35-Filter.db
20040 timetest-timetest-ka-35-Index.db
236028269 timetest-timetest-ka-35-Data.db
92998 timetest-timetest-ka-35-CompressionInfo.db
 9983 timetest-timetest-ka-35-Statistics.db
  1409144 timetest-timetest-ka-35-Summary.db

452Mlongtest-b884c4c02ed811e4bd586fd6b0389ebc
430Mtimetest-b89d7ce02ed811e4bd586fd6b0389ebc
{noformat}

I expected compression to mostly remove the differential in size as 2 bytes 
worth of the most significant bits in the long aren't used when serializing 
nanos and it looks like that's the case.  The only other justification I can 
think of for using a custom 6-byte type is to save the 2 bytes on the wire per 
record; I'm inclined to say that the added complexity both server and 
client-side to handle a non-standard data type outweigh the potential benefit.

> add date and time types
> ---
>
> Key: CASSANDRA-7523
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7523
> Project: Cassandra
>  Issue Type: New Feature
>  Components: API
>Reporter: Jonathan Ellis
>Assignee: Joshua McKenzie
>Priority: Minor
> Fix For: 2.1.1, 3.0
>
>
> http://www.postgresql.org/docs/9.1/static/datatype-datetime.html
> (we already have timestamp; interval is out of scope for now, and see 
> CASSANDRA-6350 for discussion on timestamp-with-time-zone.  but date/time 
> should be pretty easy to add.)



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


[jira] [Updated] (CASSANDRA-7021) With tracing enabled, queries should still be recorded when using prepared and batch statements

2014-08-28 Thread Tyler Hobbs (JIRA)

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

Tyler Hobbs updated CASSANDRA-7021:
---

Reproduced In:   (was: 2.0.6)
Fix Version/s: (was: 2.0.11)
   2.1.1

At this point, I think it would be better to push this to 2.1, so I'm setting 
the fix version to 2.1.1 unless somebody disagrees.

> With tracing enabled, queries should still be recorded when using prepared 
> and batch statements
> ---
>
> Key: CASSANDRA-7021
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7021
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
> Environment: C* 2.0.6 running on Ubuntu 12.04
>Reporter: Bill Joyce
>Assignee: Tyler Hobbs
>Priority: Minor
> Fix For: 2.1.1
>
>
> I've enabled tracing on my cluster and am analyzing data in the 
> system_traces.sessions table. Single statement, non-prepared queries show up 
> with data in the 'parameters' field like 'query=select * from tablename where 
> x=1' and the request field is execute_cql3_query. But batches have null in 
> the parameters field and prepared statements just have 'page size=5000' in 
> the parameters field (the request field values are 'Execute batch of CQL3 
> queries' and 'Execute CQL3 prepared query'). Please include the actual query 
> text with prepared and batch statements. This will make performance analysis 
> much easier so I can do things like sort by duration and find my most 
> expensive queries.



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


[jira] [Commented] (CASSANDRA-7423) Allow updating individual subfields of UDT

2014-08-28 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko commented on CASSANDRA-7423:
--

- there is more or less a consensus about UDTs as blobs in its current form 
being of very limited usefulness 
- making UDTs sub-field resolvable would most likely require the fields to be 
stored in separate cells
- thus a rather painful migration will be required (like supercolumns, 
CASSANDRA-3237, bugs from which we are still occasionally finding)
- a lot of other huge changes are planned for 3.0. Tackling them all at once, 
and UDT migrations on top, might end up being a hellish experience

So I have a controversial suggesting here, especially with 2.1.0 being so 
close. Maybe (maybe) we should delay UDTs altogether until 3.0, where we'll 
make them properly sub-field resolvable. The native protocol part won't have to 
change - we can just remove CREATE/ALTER/DROP TYPE from Cql.g and the docs for 
2.1.0, and remove the rest of the code (that needs removal) in 2.1.1+.

> Allow updating individual subfields of UDT
> --
>
> Key: CASSANDRA-7423
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7423
> Project: Cassandra
>  Issue Type: Improvement
>  Components: API, Core
>Reporter: Tupshin Harper
>  Labels: cql
>
> Since user defined types were implemented in CASSANDRA-5590 as blobs (you 
> have to rewrite the entire type in order to make any modifications), they 
> can't be safely used without LWT for any operation that wants to modify a 
> subset of the UDT's fields by any client process that is not authoritative 
> for the entire blob. 
> When trying to use UDTs to model complex records (particularly with nesting), 
> this is not an exceptional circumstance, this is the totally expected normal 
> situation. 
> The use of UDTs for anything non-trivial is harmful to either performance or 
> consistency or both.
> edit: to clarify, i believe that most potential uses of UDTs should be 
> considered anti-patterns until/unless we have field-level r/w access to 
> individual elements of the UDT, with individual timestamps and standard LWW 
> semantics



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


[jira] [Updated] (CASSANDRA-7840) Refactor static state & functions into static singletons

2014-08-28 Thread Blake Eggleston (JIRA)

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

Blake Eggleston updated CASSANDRA-7840:
---

Attachment: 0014-refactoring-static-methods-on-Tracing.patch
0013-making-QueryProcessor-a-singleton.patch
0012-making-MessagingService-a-singleton.patch
0011-making-StageManager-a-singleton.patch
0010-making-DefsTables-a-singleton.patch
0009-making-SinkManager-a-singleton.patch
0008-removing-static-methods-and-initialization-from-Comp.patch
0007-making-Auth-a-singleton.patch
0006-making-SystemKeyspace-a-singleton.patch
0005-making-MigrationManager-a-singleton.patch
0004-making-StorageProxy-a-singleton.patch
0003-refactoring-StorageService-static-methods.patch
0002-making-DatabaseDescriptor-a-singleton.patch
0001-splitting-StorageService-executors-into-a-separate-c.patch

> Refactor static state & functions into static singletons
> 
>
> Key: CASSANDRA-7840
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7840
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Blake Eggleston
>  Labels: patch
> Attachments: 
> 0001-splitting-StorageService-executors-into-a-separate-c.patch, 
> 0002-making-DatabaseDescriptor-a-singleton.patch, 
> 0003-refactoring-StorageService-static-methods.patch, 
> 0004-making-StorageProxy-a-singleton.patch, 
> 0005-making-MigrationManager-a-singleton.patch, 
> 0006-making-SystemKeyspace-a-singleton.patch, 
> 0007-making-Auth-a-singleton.patch, 
> 0008-removing-static-methods-and-initialization-from-Comp.patch, 
> 0009-making-SinkManager-a-singleton.patch, 
> 0010-making-DefsTables-a-singleton.patch, 
> 0011-making-StageManager-a-singleton.patch, 
> 0012-making-MessagingService-a-singleton.patch, 
> 0013-making-QueryProcessor-a-singleton.patch, 
> 0014-refactoring-static-methods-on-Tracing.patch
>
>
> 1st step of CASSANDRA-7837.
> Things like DatabaseDescriptor.getPartitioner() should become 
> DatabaseDescriptor.instance.getPartitioner(). In cases where there is a mix 
> of instance state and static functionality (Keyspace & ColumnFamilyStore 
> classes), the static portion should be split off into singleton factory 
> classes.



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


[jira] [Issue Comment Deleted] (CASSANDRA-7840) Refactor static state & functions into static singletons

2014-08-28 Thread Blake Eggleston (JIRA)

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

Blake Eggleston updated CASSANDRA-7840:
---

Comment: was deleted

(was: ... submit patch didn't prompt me to upload any files)

> Refactor static state & functions into static singletons
> 
>
> Key: CASSANDRA-7840
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7840
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Blake Eggleston
>  Labels: patch
> Attachments: 
> 0001-splitting-StorageService-executors-into-a-separate-c.patch, 
> 0002-making-DatabaseDescriptor-a-singleton.patch, 
> 0003-refactoring-StorageService-static-methods.patch, 
> 0004-making-StorageProxy-a-singleton.patch, 
> 0005-making-MigrationManager-a-singleton.patch, 
> 0006-making-SystemKeyspace-a-singleton.patch, 
> 0007-making-Auth-a-singleton.patch, 
> 0008-removing-static-methods-and-initialization-from-Comp.patch, 
> 0009-making-SinkManager-a-singleton.patch, 
> 0010-making-DefsTables-a-singleton.patch, 
> 0011-making-StageManager-a-singleton.patch, 
> 0012-making-MessagingService-a-singleton.patch, 
> 0013-making-QueryProcessor-a-singleton.patch, 
> 0014-refactoring-static-methods-on-Tracing.patch
>
>
> 1st step of CASSANDRA-7837.
> Things like DatabaseDescriptor.getPartitioner() should become 
> DatabaseDescriptor.instance.getPartitioner(). In cases where there is a mix 
> of instance state and static functionality (Keyspace & ColumnFamilyStore 
> classes), the static portion should be split off into singleton factory 
> classes.



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


[jira] [Commented] (CASSANDRA-7846) Archive Commitlog Tests Failings

2014-08-28 Thread Yuki Morishita (JIRA)

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

Yuki Morishita commented on CASSANDRA-7846:
---

TestArchiveCommitlog is re-creating table, thus CF ID changes and archived 
commit log won't replay.

We have to modify test to fit the behavior after CASSANDRA-5202 not to recreate 
schema and restore schema from system.schema_* snapshots before restoring 
archive logs. 
(https://issues.apache.org/jira/browse/CASSANDRA-6974?focusedCommentId=13976872&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13976872)
 


> Archive Commitlog Tests Failings
> 
>
> Key: CASSANDRA-7846
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7846
> Project: Cassandra
>  Issue Type: Bug
> Environment: OSX and Ubuntu 14.04
>Reporter: Philip Thompson
>
> Four of the snapshot_test.py:TestArchiveCommitlog tests are failing on 2.1.0 
> and 2.1-HEAD:
> http://cassci.datastax.com/job/cassandra-2.1.0_dtest/lastCompletedBuild/testReport/snapshot_test/
> The tests restore archived commit logs and check how many rows exist after 
> restoring. They are passing on 2.0-HEAD.



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


[jira] [Updated] (CASSANDRA-6602) Compaction improvements to optimize time series data

2014-08-28 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-6602:


Reviewer: Marcus Eriksson  (was: Eric Evans)

> Compaction improvements to optimize time series data
> 
>
> Key: CASSANDRA-6602
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6602
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Core
>Reporter: Tupshin Harper
>Assignee: Björn Hegerfors
>  Labels: compaction, performance
> Fix For: 3.0
>
> Attachments: 1 week.txt, 8 weeks.txt, STCS 16 hours.txt, 
> TimestampViewer.java, 
> cassandra-2.0-CASSANDRA-6602-DateTieredCompactionStrategy.txt, 
> cassandra-2.0-CASSANDRA-6602-DateTieredCompactionStrategy_v2.txt, 
> cassandra-2.0-CASSANDRA-6602-DateTieredCompactionStrategy_v3.txt
>
>
> There are some unique characteristics of many/most time series use cases that 
> both provide challenges, as well as provide unique opportunities for 
> optimizations.
> One of the major challenges is in compaction. The existing compaction 
> strategies will tend to re-compact data on disk at least a few times over the 
> lifespan of each data point, greatly increasing the cpu and IO costs of that 
> write.
> Compaction exists to
> 1) ensure that there aren't too many files on disk
> 2) ensure that data that should be contiguous (part of the same partition) is 
> laid out contiguously
> 3) deleting data due to ttls or tombstones
> The special characteristics of time series data allow us to optimize away all 
> three.
> Time series data
> 1) tends to be delivered in time order, with relatively constrained exceptions
> 2) often has a pre-determined and fixed expiration date
> 3) Never gets deleted prior to TTL
> 4) Has relatively predictable ingestion rates
> Note that I filed CASSANDRA-5561 and this ticket potentially replaces or 
> lowers the need for it. In that ticket, jbellis reasonably asks, how that 
> compaction strategy is better than disabling compaction.
> Taking that to heart, here is a compaction-strategy-less approach that could 
> be extremely efficient for time-series use cases that follow the above 
> pattern.
> (For context, I'm thinking of an example use case involving lots of streams 
> of time-series data with a 5GB per day ingestion rate, and a 1000 day 
> retention with TTL, resulting in an eventual steady state of 5TB per node)
> 1) You have an extremely large memtable (preferably off heap, if/when doable) 
> for the table, and that memtable is sized to be able to hold a lengthy window 
> of time. A typical period might be one day. At the end of that period, you 
> flush the contents of the memtable to an sstable and move to the next one. 
> This is basically identical to current behaviour, but with thresholds 
> adjusted so that you can ensure flushing at predictable intervals. (Open 
> question is whether predictable intervals is actually necessary, or whether 
> just waiting until the huge memtable is nearly full is sufficient)
> 2) Combine the behaviour with CASSANDRA-5228 so that sstables will be 
> efficiently dropped once all of the columns have. (Another side note, it 
> might be valuable to have a modified version of CASSANDRA-3974 that doesn't 
> bother storing per-column TTL since it is required that all columns have the 
> same TTL)
> 3) Be able to mark column families as read/write only (no explicit deletes), 
> so no tombstones.
> 4) Optionally add back an additional type of delete that would delete all 
> data earlier than a particular timestamp, resulting in immediate dropping of 
> obsoleted sstables.
> The result is that for in-order delivered data, Every cell will be laid out 
> optimally on disk on the first pass, and over the course of 1000 days and 5TB 
> of data, there will "only" be 1000 5GB sstables, so the number of filehandles 
> will be reasonable.
> For exceptions (out-of-order delivery), most cases will be caught by the 
> extended (24 hour+) memtable flush times and merged correctly automatically. 
> For those that were slightly askew at flush time, or were delivered so far 
> out of order that they go in the wrong sstable, there is relatively low 
> overhead to reading from two sstables for a time slice, instead of one, and 
> that overhead would be incurred relatively rarely unless out-of-order 
> delivery was the common case, in which case, this strategy should not be used.
> Another possible optimization to address out-of-order would be to maintain 
> more than one time-centric memtables in memory at a time (e.g. two 12 hour 
> ones), and then you always insert into whichever one of the two "owns" the 
> appropriate range of time. By delaying flushing the ahead one until we are 
> ready to roll writes over to a third one, we are 

[jira] [Created] (CASSANDRA-7847) Allow quoted identifiers for triggers' names

2014-08-28 Thread Mikhail Stepura (JIRA)
Mikhail Stepura created CASSANDRA-7847:
--

 Summary: Allow quoted identifiers for triggers' names
 Key: CASSANDRA-7847
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7847
 Project: Cassandra
  Issue Type: Bug
Reporter: Mikhail Stepura
Assignee: Mikhail Stepura
Priority: Minor
 Fix For: 2.1.1


Current implementation doesn't allow quoted/case sensitive identifiers for 
triggers' names, and doesn't handle those names in case-insensitive manner  
either.
{code}
mstepura-mac:cassandra mikhail$ bin/cqlsh
Connected to Test Cluster at 127.0.0.1:9042.
[cqlsh 5.0.1 | Cassandra 2.1.1-SNAPSHOT | CQL spec 3.2.0 | Native protocol v3]
Use HELP for help.
cqlsh> use stress;
cqlsh:stress> create TRIGGER "ZooZoo" ON t1 USING  
'org.apache.cassandra.triggers.InvertedIndex';

cqlsh:stress>
cqlsh:stress>
cqlsh:stress> create TRIGGER ZooZoo ON t1 USING  
'org.apache.cassandra.triggers.InvertedIndex';
cqlsh:stress>
cqlsh:stress>
cqlsh:stress> drop TRIGGER zoozoo ON stress.t1 ;
code=2200 [Invalid query] message="Trigger zoozoo was not found"
cqlsh:stress>
cqlsh:stress>
cqlsh:stress> drop TRIGGER "ZooZoo" ON stress.t1 ;

cqlsh:stress>
cqlsh:stress>
cqlsh:stress> drop TRIGGER ZooZoo ON stress.t1 ;
{code}



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


[jira] [Updated] (CASSANDRA-7847) Allow quoted identifiers for triggers' names

2014-08-28 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura updated CASSANDRA-7847:
---

Reviewer: Sylvain Lebresne

> Allow quoted identifiers for triggers' names
> 
>
> Key: CASSANDRA-7847
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7847
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Mikhail Stepura
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.1
>
>
> Current implementation doesn't allow quoted/case sensitive identifiers for 
> triggers' names, and doesn't handle those names in case-insensitive manner  
> either.
> {code}
> mstepura-mac:cassandra mikhail$ bin/cqlsh
> Connected to Test Cluster at 127.0.0.1:9042.
> [cqlsh 5.0.1 | Cassandra 2.1.1-SNAPSHOT | CQL spec 3.2.0 | Native protocol v3]
> Use HELP for help.
> cqlsh> use stress;
> cqlsh:stress> create TRIGGER "ZooZoo" ON t1 USING  
> 'org.apache.cassandra.triggers.InvertedIndex';
> 
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> create TRIGGER ZooZoo ON t1 USING  
> 'org.apache.cassandra.triggers.InvertedIndex';
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER zoozoo ON stress.t1 ;
> code=2200 [Invalid query] message="Trigger zoozoo was not found"
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER "ZooZoo" ON stress.t1 ;
> 
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER ZooZoo ON stress.t1 ;
> {code}



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


[jira] [Updated] (CASSANDRA-7847) Allow quoted identifiers for triggers' names

2014-08-28 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura updated CASSANDRA-7847:
---

Attachment: CASSANDRA-2.1-7847.patch

> Allow quoted identifiers for triggers' names
> 
>
> Key: CASSANDRA-7847
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7847
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Mikhail Stepura
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-2.1-7847.patch
>
>
> Current implementation doesn't allow quoted/case sensitive identifiers for 
> triggers' names, and doesn't handle those names in case-insensitive manner  
> either.
> {code}
> mstepura-mac:cassandra mikhail$ bin/cqlsh
> Connected to Test Cluster at 127.0.0.1:9042.
> [cqlsh 5.0.1 | Cassandra 2.1.1-SNAPSHOT | CQL spec 3.2.0 | Native protocol v3]
> Use HELP for help.
> cqlsh> use stress;
> cqlsh:stress> create TRIGGER "ZooZoo" ON t1 USING  
> 'org.apache.cassandra.triggers.InvertedIndex';
> 
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> create TRIGGER ZooZoo ON t1 USING  
> 'org.apache.cassandra.triggers.InvertedIndex';
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER zoozoo ON stress.t1 ;
> code=2200 [Invalid query] message="Trigger zoozoo was not found"
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER "ZooZoo" ON stress.t1 ;
> 
> cqlsh:stress>
> cqlsh:stress>
> cqlsh:stress> drop TRIGGER ZooZoo ON stress.t1 ;
> {code}



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


[jira] [Updated] (CASSANDRA-7824) cqlsh completion for triggers

2014-08-28 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura updated CASSANDRA-7824:
---

Attachment: CASSANDRA-2.1-7824.patch

> cqlsh completion for triggers
> -
>
> Key: CASSANDRA-7824
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7824
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Sylvain Lebresne
>Assignee: Mikhail Stepura
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-2.1-7824.patch
>
>
> It appears cqlsh doesn't have completion for the trigger related statements 
> and we should probably add it.
> Triggers are also not documented by the {{cql.textile}} file. I could swear 
> we already had a ticket for fixing the doc, but can't find it right now, so 
> unless someone remembers which ticket that is, let's maybe handle this here 
> too.



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


[jira] [Commented] (CASSANDRA-7824) cqlsh completion for triggers

2014-08-28 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura commented on CASSANDRA-7824:


Attached patch contains changes for cqlsh, textile and patched python-driver 
(with https://github.com/datastax/python-driver/pull/189)

> cqlsh completion for triggers
> -
>
> Key: CASSANDRA-7824
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7824
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Sylvain Lebresne
>Assignee: Mikhail Stepura
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-2.1-7824.patch
>
>
> It appears cqlsh doesn't have completion for the trigger related statements 
> and we should probably add it.
> Triggers are also not documented by the {{cql.textile}} file. I could swear 
> we already had a ticket for fixing the doc, but can't find it right now, so 
> unless someone remembers which ticket that is, let's maybe handle this here 
> too.



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


[jira] [Assigned] (CASSANDRA-7514) Support paging in cqlsh

2014-08-28 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura reassigned CASSANDRA-7514:
--

Assignee: Mikhail Stepura

> Support paging in cqlsh
> ---
>
> Key: CASSANDRA-7514
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7514
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Sylvain Lebresne
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.1
>
>
> Once we've switch cqlsh to use the python driver 2.x (CASSANDRA-7506), we 
> should also make it use paging. Currently cqlsh adds an implicit limit which 
> is kind of ugly. Instead we should use some reasonably small page size (100 
> is probably fine) and display one page at a time, adding some "NEXT" command 
> to query/display following pages.



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