[jira] [Commented] (CASSANDRA-10547) Updating a CQL List many times creates many tombstones

[Robert Stupp (JIRA)]

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

Robert Stupp commented on CASSANDRA-10547:
--

Is this also true for non-frozen sets?

> Updating a CQL List many times creates many tombstones 
> ---
>
> Key: CASSANDRA-10547
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10547
> Project: Cassandra
>  Issue Type: Bug
> Environment: Cassandra 2.1.9, Java driver 2.1.5
>Reporter: James Bishop
> Attachments: tombstone.snippet
>
>
> We encountered a TombstoneOverwhelmingException in cassandra system.log which 
> caused some of our CQL queries to fail.
> We are able to reproduce this issue by updating a CQL List column many times. 
> The number of tombstones created seems to be related to (number of list items 
> * number of list updates). We update the entire list on each update using the 
> java driver. (see attached code for details)
> Running nodetool compact does not help, but nodetool flush does. It appears 
> that the tombstones are being accumulated in memory. 
> For example if we update a list of 100 items 1000 times, this creates more  
> than 100,000 tombstones and exceeds the default tombstone_failure_threshold.



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

[jira] [Commented] (CASSANDRA-10645) sstableverify_test dtest fails on Windows

[Joel Knighton (JIRA)]

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

Joel Knighton commented on CASSANDRA-10645:
---

Fixes merged to the dtests repo in 
[b7d903ad2c0ac2e6a2de4f59b4f398d1f214f707|https://github.com/riptano/cassandra-dtest/commit/b7d903ad2c0ac2e6a2de4f59b4f398d1f214f707].

> sstableverify_test dtest fails on Windows
> -
>
> Key: CASSANDRA-10645
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10645
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joel Knighton
>
> {{offline_tools_test.py:TestOfflineTools.sstableverify_test}} fails on CassCI 
> on C* 3.0 on Windows
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/history/
> It fails consistently, but not always after checking the same number of 
> sstables. For instance:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/
> vs.
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/93/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/
> I'm not sure if that's significant, but just in case, I thought it was worth 
> noting.
> Doesn't look like anyone's worked on this test particularly recently; 
> [~JoshuaMcKenzie], can you please find an assignee for this?



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

[jira] [Commented] (CASSANDRA-10485) Missing host ID on hinted handoff write

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-10485:
-

I implemented an alternative approach which is a bit cleaner and more 
deterministic. The basic idea is to have a new method 
{{TokenMetadata.isMemberOrPending()}}, and only submit hints to endpoints that 
are ring members or pending membership, thus, avoiding fetching null host IDs 
for removed pending endpoints while the new pending ranges are being calculated.

In order to support the {{TokenMetadata.isMemberOrPending()}} method, the 
{{TokenMetadata}} maintains a new {{livePendingEndpoints}} set which is 
populated every time new pending ranges are set. When endpoints are removed 
from {{TokenMetadata}} via the {{removeEndpoint}} method, they're also removed 
from the {{livePendingEndpoints}} set, so {{TokenMetadata.isMemberOrPending()}} 
returns false if the endpoint is evicted from the ring. Since both 
{{removeEndpoint}} and {{setPendingRanges}} update this set, they share a write 
lock. {{TokenMetadata.isMemberOrPending()}} also uses a read lock, similar to 
other methods {{isMember()}} or {{getHostId()}}.

Merging the solution from 2.1 to 2.2/3.0 was a bit tricky because the pending 
ranges calculation was extracted from the {{PendingRangeCalculatorService}} to 
{{TokenMetadata}} within a read lock, so I had to separate the actual 
calculation (within a read lock) to the actual  assignment of the 
{{pendingRanges}} via the {{setPendingRanges}} method, which uses a write lock. 
On 3.0, the hints submission part is slightly different (even simpler) due to 
the new hints implementation.

It's still not ideal but I guess better than the previous approach. I will add 
a link from this ticket to CASSANDRA-6061 so we can take this ticket into 
account when refactoring the {{TokenMetadata}}.

Below are the new branches and test results:
||2.1||2.2||3.0||trunk||
|[branch|https://github.com/apache/cassandra/compare/cassandra-2.1...pauloricardomg:2.1-10485-v3]|[branch|https://github.com/apache/cassandra/compare/cassandra-2.2...pauloricardomg:2.2-10485-v3]|[branch|https://github.com/apache/cassandra/compare/cassandra-3.0...pauloricardomg:3.0-10485-v3]|[branch|https://github.com/apache/cassandra/compare/trunk...pauloricardomg:trunk-10485-v3]|
|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-2.1-10485-v3-testall/lastCompletedBuild/testReport/]|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-2.2-10485-v3-testall/lastCompletedBuild/testReport/]|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.0-10485-v3-testall/lastCompletedBuild/testReport/]|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-10485-v3-testall/lastCompletedBuild/testReport/]|
|[dtests|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-2.1-10485-v3-dtest/lastCompletedBuild/testReport/]|[dtests|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-2.2-10485-v3-dtest/lastCompletedBuild/testReport/]|[dtests|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.0-10485-v3-dtest/lastCompletedBuild/testReport/]|[dtests|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-10485-v3-dtest/lastCompletedBuild/testReport/]|


> Missing host ID on hinted handoff write
> ---
>
> Key: CASSANDRA-10485
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10485
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Paulo Motta
>Assignee: Paulo Motta
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
>
> when I restart one of them I receive the error "Missing host ID":
> {noformat}
> WARN  [SharedPool-Worker-1] 2015-10-08 13:15:33,882 
> AbstractTracingAwareExecutorService.java:169 - Uncaught exception on thread 
> Thread[SharedPool-Worker-1,5,main]: {}
> java.lang.AssertionError: Missing host ID for 63.251.156.141
> at 
> org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:978)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.service.StorageProxy$6.runMayThrow(StorageProxy.java:950)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.service.StorageProxy$HintRunnable.run(StorageProxy.java:2235)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_60]
> at 
> org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> 

[jira] [Commented] (CASSANDRA-10430) "Load" report from "nodetool status" is inaccurate

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10430:
--

Pinging [~yukim], any idea why this might be happening?

> "Load" report from "nodetool status" is inaccurate
> --
>
> Key: CASSANDRA-10430
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10430
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra v2.1.9 running on 6 node Amazon AWS, vnodes 
> enabled. 
>Reporter: julia zhang
> Fix For: 2.1.x
>
> Attachments: system.log.2.zip, system.log.3.zip, system.log.4.zip
>
>
> After running an incremental repair, nodetool status report unbalanced load 
> among cluster. 
> $ nodetool status mykeyspace
> ==
> ||Status|| Address ||Load   ||Tokens  ||Owns (effective)  
> ||Host ID ||  Rack || 
> |UN  |10.1.1.1  |1.13 TB   |256|48.5%
> |a4477534-a5c6-4e3e-9108-17a69aebcfc0|  RAC1|
> |UN  |10.1.1.2  |2.58 TB   |256 |50.5% 
> |1a7c3864-879f-48c5-8dde-bc00cf4b23e6  |RAC2|
> |UN  |10.1.1.3  |1.49 TB   |256 |51.5% 
> |27df5b30-a5fc-44a5-9a2c-1cd65e1ba3f7  |RAC1|
> |UN  |10.1.1.4  |250.97 GB  |256 |51.9% 
> |9898a278-2fe6-4da2-b6dc-392e5fda51e6  |RAC3|
> |UN  |10.1.1.5 |1.88 TB  |256 |49.5% 
> |04aa9ce1-c1c3-4886-8d72-270b024b49b9  |RAC2|
> |UN  |10.1.1.6 |1.3 TB|256 |48.1% 
> |6d5d48e6-d188-4f88-808d-dcdbb39fdca5  |RAC3|
> It seems that only 10.1.1.4 reports correct "Load". There is no hints in the 
> cluster and report remains the same after running "nodetool cleanup" on each 
> node. "nodetool cfstats" shows number of keys are evenly distributed and 
> Cassandra data physical disk on each node report about the same usage. 
> "nodetool status" report these inaccurate large storage load until we restart 
> each node, after the restart, "Load" report match what we've seen from disk.  
> We did not see this behavior until upgrade to v2.1.9



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

[jira] [Updated] (CASSANDRA-10370) upgrade_tests.cql_tests:TestCQL.static_columns_with_distinct_test fails in 2.1 nodes

[Jim Witschey (JIRA)]

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

Jim Witschey updated CASSANDRA-10370:
-
Fix Version/s: 2.1.x

> upgrade_tests.cql_tests:TestCQL.static_columns_with_distinct_test fails in 
> 2.1 nodes
> 
>
> Key: CASSANDRA-10370
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10370
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Blake Eggleston
> Fix For: 2.1.x
>
>
> When running the dtest 
> {{upgrade_tests.cql_tests:TestCQL.static_columns_with_distinct_test}} against 
> 2x2.1 nodes, the test fails due to a row being returned multiple times. This 
> isn't reproducible between 3.0 nodes, but is between 2.1<->3.0 nodes, so it's 
> safe to say it's not a 3.0 bug. To reproduce, run:
> {noformat}UPGRADE_MODE=none nosetests 
> upgrade_tests/cql_tests.py:TestCQL.static_columns_with_distinct_test{noformat}
>  with the environment variable {{OLD_CASSANDRA_DIR}} set to a repo with 
> cassandra-2.1 checked out.



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

[jira] [Commented] (CASSANDRA-10633) cqlsh copy uses wrong variable name for time_format

[Stefania (JIRA)]

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

Stefania commented on CASSANDRA-10633:
--

Thank you [~iamaleksey] and [~pauloricardomg]!

> cqlsh copy uses wrong variable name for time_format
> ---
>
> Key: CASSANDRA-10633
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10633
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Stefania
> Fix For: 2.2.4, 2.1.12, 3.0.0
>
>
> {code}
> diff --git a/bin/cqlsh b/bin/cqlsh
> index ca45be3..ddf0314 100755
> --- a/bin/cqlsh
> +++ b/bin/cqlsh
> @@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
>  encoding = opts.pop('encoding', 'utf8')
>  nullval = opts.pop('null', '')
>  header = bool(opts.pop('header', '').lower() == 'true')
> -timestamp_format = opts.pop('time_format', 
> self.display_timestamp_format)
> +timestamp_format = opts.pop('time_format', self.display_time_format)
>  if dialect_options['quotechar'] == dialect_options['escapechar']:
>  dialect_options['doublequote'] = True
>  del dialect_options['escape char']
> {code}



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

[jira] [Commented] (CASSANDRA-10599) Delete operation not deleting sometimes by Trigger augment method

[Ashraful Islam (JIRA)]

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

Ashraful Islam commented on CASSANDRA-10599:


To understand better let's take an example :

First i write a code that insert value with the same primary key when a delete 
occur on another table
{code:title=DeleteToInsert.java|borderStyle=solid}
public Collection augment(ByteBuffer key, ColumnFamily update) {
String keySpace = properties.getProperty("keyspace");
String columnFamily = properties.getProperty("table");

if (!update.deletionInfo().isLive()) {

CFMetaData cfMetaData = Schema.instance.getCFMetaData(keySpace, 
columnFamily);

for (ColumnDefinition columnDefinition : 
cfMetaData.allColumns()) {
Mutation mutation = new Mutation(keySpace, key);
mutation.add(columnFamily, 
CellNames.simpleSparse(columnDefinition.name), System.currentTimeMillis());
}
}
}
{code}

with this code i insert into table test

||id||value_1||value_2||
|1|35|36|
|2|36|37|

here id is the primary key

and now i insert into table test with insert into values query

||id||value_1||value_2||
|3|37|38|
|4|38|39|

now i remve the delete to insert trigger and write the code of delete that 
delete value with the same primary key when a delete occur on another table

{code:title=DeleteToDelete.java|borderStyle=solid}
@Override
public Collection augment(ByteBuffer key, ColumnFamily update) {
String keySpace = properties.getProperty("keyspace");
String columnFamily = properties.getProperty("table");

if (!update.deletionInfo().isLive()) {

CFMetaData cfMetaData = Schema.instance.getCFMetaData(keySpace, 
columnFamily);

for (ColumnDefinition columnDefinition : 
cfMetaData.allColumns()) {
Mutation mutation = new Mutation(keySpace, key);
mutation.delete(columnFamily, 
CellNames.simpleSparse(columnDefinition.name), System.currentTimeMillis());
}
}
}
{code}

when i delete 1 and 2 from another table the row with id 1 and 2 also delete 
from test table
but if i delete 3 and 4 nothing occure

> Delete operation not deleting sometimes  by Trigger augment method
> --
>
> Key: CASSANDRA-10599
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10599
> Project: Cassandra
>  Issue Type: Bug
>  Components: CQL, Tools
> Environment: CentOS 6.6 Cassandra 2.2.2
>Reporter: Ashraful Islam
>   Original Estimate: 1h
>  Remaining Estimate: 1h
>
> I was trying to delete a row from one table when another table's row with the 
> same primary key has been deleted
> {code:title=DeleteToDelete.java|borderStyle=solid}
> @Override
> public Collection augment(ByteBuffer key, ColumnFamily update) {
>   String keySpace = properties.getProperty("keyspace");
>   String columnFamily = properties.getProperty("table");
>   if (!update.deletionInfo().isLive()) {
>   CFMetaData cfMetaData = Schema.instance.getCFMetaData(keySpace, 
> columnFamily);
>   for (ColumnDefinition columnDefinition : 
> cfMetaData.allColumns()) {
>   Mutation mutation = new Mutation(keySpace, key);
>   mutation.delete(columnFamily, 
> CellNames.simpleSparse(columnDefinition.name), System.currentTimeMillis());
>   }
>   }
> }
> {code}
> *This code is not deleting row with the same key that have been inserted with 
> insert into values command.*
> *but if i insert the value by replacing*
> {code}
> mutation.delete(columnFamily, CellNames.simpleSparse(columnDefinition.name), 
> System.currentTimeMillis());
> {code}
> *by* 
> {code}
> mutation.add(columnFamily, CellNames.simpleSparse(columnDefinition.name), 
> ByteBufferUtil.bytes(35), System.currentTimeMillis());
> {code}
> *in the above code, Then the value is deleted with the trigger*



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

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

[slebresne]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 943294ba2914ceefd81f4937e182c484041f26ca
Parents: 8f189d1 9253360
Author: Sylvain Lebresne 
Authored: Fri Nov 6 10:55:03 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 10:55:03 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c3548a,98c98ab..5352f22
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
--

[jira] [Created] (CASSANDRA-10663) cassandra-stress timers

[Ahmed ELJAMI (JIRA)]

Ahmed ELJAMI created CASSANDRA-10663:


 Summary: cassandra-stress timers
 Key: CASSANDRA-10663
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10663
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Ahmed ELJAMI
Priority: Minor


I think that is intresting as it is very practical  to have an option to make 
mounted charge per time step, like Timers in Jmeter.

We can use the new YAML file in cassandra-stress like:

Timers:

  timers1: #500 op on 900 sec
  start: 500 #number of op
  timer: 900 #in second
  end: 500 #number of op

#Then

timers2: #up to 1000 op on 900 sec
  start: 1000 #number of op
  timer: 900 #in second
  end: 1000 #number of op
   

What do you think ?



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

[jira] [Updated] (CASSANDRA-10573) select_distinct_test flapping on 2.2 -> 3.0 upgrade path

[Benjamin Lerer (JIRA)]

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

Benjamin Lerer updated CASSANDRA-10573:
---
Reviewer: Sylvain Lebresne

> select_distinct_test flapping on 2.2 -> 3.0 upgrade path
> 
>
> Key: CASSANDRA-10573
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10573
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
> Attachments: 10573-3.0.txt
>
>
> The {{upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test 
> flaps}} dtest flaps on CassCI. It flaps locally for me as well:
> {code}
> CASSANDRA_VERSION=git:cassandra-3.0 nosetests 
> upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test
> {code}
> Once [this dtest pr|https://github.com/riptano/cassandra-dtest/pull/624] is 
> merged, you can run against a local directory with 
> {code}
> CASSANDRA_VERSION=git:cassandra-3.0 OLD_CASSANDRA_VERSION=binary:2.2.3 
> UPGRADE_TO_DIR=~/path/to/cassandra nosetests 
> upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test --no-skip
> {code}
> Apologies for the ugly interface for that. To run on Windows, use {{set}} to 
> set environment variables like {{CASSANDRA_VERSION}} instead of including 
> them in the command.
> The history for the test is here:
> http://cassci.datastax.com/view/cassandra-3.0/job/cassandra-3.0_dtest/280/testReport/junit/upgrade_tests.cql_tests/TestCQL/select_distinct_test/
> Note that the name of the class containing the test has changed from 
> {{TestCQL}} to ; its behavior hasn't.



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

[jira] [Commented] (CASSANDRA-10607) Using reserved keyword for Type field crashes cqlsh

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10607:
--

The field name is quoted, so in theory you should be able to use anything for 
it and the table definition should be valid. In fact, pretty sure the error 
thrown is thrown by C*. In fact, grepping the error in the C* sources returns 
nothing, so I suspect this is an error thrown by the python driver. And so I 
would say this is a python driver issue. But I don't follow the python driver 
(nor cqlsh) very closely, so going to ping [~aholmber]: does that error message 
ring a bell?

> Using reserved keyword for Type field crashes cqlsh
> ---
>
> Key: CASSANDRA-10607
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10607
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Mac OS X El Capitan, Java 1.8.0_25-b17, fresh install of 
> apache-cassandra-2.2.1-bin.tar.gz
>Reporter: Mike Prince
>Priority: Minor
> Fix For: 2.2.x
>
> Attachments: create.cql
>
>
> 1) From a fresh cassandra node start, start cqlsh and execute:
> {code}
> CREATE KEYSPACE foospace
> WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
> USE foospace;
> CREATE TYPE Foo(
>   "from" text
> );
> CREATE TABLE Bar(
>   id text PRIMARY KEY,
>   foo frozen
> );
> {code}
> 2) {{select * from bar;}}
> {code}
> Traceback (most recent call last):
>   File "bin/cqlsh.py", line 1166, in perform_simple_statement
> rows = future.result(self.session.default_timeout)
>   File 
> "/Users/mike/mobido/servers/apache-cassandra-2.2.1/bin/../lib/cassandra-driver-internal-only-2.6.0c2.post.zip/cassandra-driver-2.6.0c2.post/cassandra/cluster.py",
>  line 3296, in result
> raise self._final_exception
> ValueError: Type names and field names cannot be a keyword: 'from'
> {code}
> 3) Exit cqlsh and try to run cqlsh again, this error occurs:
> {code}
> Connection error: ('Unable to connect to any servers', {'127.0.0.1': 
> ValueError("Don't know how to parse type string 
> u'org.apache.cassandra.db.marshal.UserType(foospace,666f6f,66726f6d:org.apache.cassandra.db.marshal.UTF8Type)':
>  Type names and field names cannot be a keyword: 'from'",)})
> {code}



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

[jira] [Updated] (CASSANDRA-10573) select_distinct_test flapping on 2.2 -> 3.0 upgrade path

[Benjamin Lerer (JIRA)]

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

Benjamin Lerer updated CASSANDRA-10573:
---
Attachment: 10573-3.0.txt

The test is flapping because the token ranges are randomly assigned. If the 
data is on the {{2.2}} coordinator node the test will pass but if the data end 
up on the {{3.0}} node the test will fail.

I think we should try to make our tests more deterministic. We tend to delay 
looking at flappy tests because they are more complex to investigate. 

In this case the problem is cause by the fact that the {{3.0}} node return 
empty rows as only the partition keys are requested. The {{StorageProxy}} of 
the {{2.2}} coordinator node will ignore those rows as they do not contains any 
cell.

The patch fix that problem by making the {{3.0}} node returning the row cells 
when the coordinator node is a {{2.X}} node.

The other approach would have been to make the {{2.2}} {{StorageProxy}} not 
ignore the empty rows.  

> select_distinct_test flapping on 2.2 -> 3.0 upgrade path
> 
>
> Key: CASSANDRA-10573
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10573
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
> Attachments: 10573-3.0.txt
>
>
> The {{upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test 
> flaps}} dtest flaps on CassCI. It flaps locally for me as well:
> {code}
> CASSANDRA_VERSION=git:cassandra-3.0 nosetests 
> upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test
> {code}
> Once [this dtest pr|https://github.com/riptano/cassandra-dtest/pull/624] is 
> merged, you can run against a local directory with 
> {code}
> CASSANDRA_VERSION=git:cassandra-3.0 OLD_CASSANDRA_VERSION=binary:2.2.3 
> UPGRADE_TO_DIR=~/path/to/cassandra nosetests 
> upgrade_tests/cql_tests.py:TestCQLNodes2RF1.select_distinct_test --no-skip
> {code}
> Apologies for the ugly interface for that. To run on Windows, use {{set}} to 
> set environment variables like {{CASSANDRA_VERSION}} instead of including 
> them in the command.
> The history for the test is here:
> http://cassci.datastax.com/view/cassandra-3.0/job/cassandra-3.0_dtest/280/testReport/junit/upgrade_tests.cql_tests/TestCQL/select_distinct_test/
> Note that the name of the class containing the test has changed from 
> {{TestCQL}} to ; its behavior hasn't.



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

[1/2] cassandra git commit: Disable value skipping as that breaks read-repair currently

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 8f189d110 -> 943294ba2


Disable value skipping as that breaks read-repair currently

patch by slebresne; reviewed by beobal for CASSANDRA-10655


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

Branch: refs/heads/trunk
Commit: 925336031ac24b0bb0cb5d1daf5c91bf71462649
Parents: cc4d759
Author: Sylvain Lebresne 
Authored: Thu Nov 5 15:52:32 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 10:53:55 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92533603/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 433bc85..98c98ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)
  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
  * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92533603/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java 
b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
index 62329ab..05eade5 100644
--- a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
@@ -123,7 +123,8 @@ public class ColumnFilter
  */
 public boolean canSkipValue(ColumnDefinition column)
 {
-return isFetchAll && selection != null && !selection.contains(column);
+// We don't use that currently, see #10655 for more details.
+return false;
 }
 
 /**

cassandra git commit: Disable value skipping as that breaks read-repair currently

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 cc4d759c9 -> 925336031


Disable value skipping as that breaks read-repair currently

patch by slebresne; reviewed by beobal for CASSANDRA-10655


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

Branch: refs/heads/cassandra-3.0
Commit: 925336031ac24b0bb0cb5d1daf5c91bf71462649
Parents: cc4d759
Author: Sylvain Lebresne 
Authored: Thu Nov 5 15:52:32 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 10:53:55 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92533603/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 433bc85..98c98ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)
  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
  * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92533603/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java 
b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
index 62329ab..05eade5 100644
--- a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
@@ -123,7 +123,8 @@ public class ColumnFilter
  */
 public boolean canSkipValue(ColumnDefinition column)
 {
-return isFetchAll && selection != null && !selection.contains(column);
+// We don't use that currently, see #10655 for more details.
+return false;
 }
 
 /**

[jira] [Commented] (CASSANDRA-10662) Make UFTest.testAmokUDF non-flappy

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10662:
--

Haven't really looked at the patch, but the test result show the test failing 
(and not with a timeout). I don't think that's what we expect here, is it?

> Make UFTest.testAmokUDF non-flappy
> --
>
> Key: CASSANDRA-10662
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10662
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
> Fix For: 3.1
>
>
> UFTest.testAmokUDF currently relies on some (strict) timeouts.



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

[jira] [Commented] (CASSANDRA-10662) Make UFTest.testAmokUDF non-flappy

[Robert Stupp (JIRA)]

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

Robert Stupp commented on CASSANDRA-10662:
--

"amok UDFs"-tests rely on proper timing. To speed up the unit test I've used 
very low timeouts - but that made the test flappy.
The proposed patch increases the timeout and adds some retry mechanism to 
mitigate "false failures".

> Make UFTest.testAmokUDF non-flappy
> --
>
> Key: CASSANDRA-10662
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10662
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
> Fix For: 3.1
>
>
> UFTest.testAmokUDF currently relies on some (strict) timeouts.



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

[1/2] cassandra git commit: Skip sstable base on clustering in names query

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 943294ba2 -> 9280273f7


Skip sstable base on clustering in names query

patch by slebresne; reviewed by iamaleksey for CASSANDRA-10571


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

Branch: refs/heads/trunk
Commit: 1e4d44e18e4cc1fd3f7e4eaf00c89ebc798e142c
Parents: 9253360
Author: Sylvain Lebresne 
Authored: Fri Oct 23 12:20:28 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 11:53:32 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 35 +++-
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 ++--
 3 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e4d44e1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c98ab..bb8b4d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Skip sstable on clustering in names query (CASSANDRA-10571)
  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)
  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e4d44e1/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java 
b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 4d7d93c..4d410a0 100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@ -527,7 +527,7 @@ public class SinglePartitionReadCommand extends ReadCommand
 if (sstable.getMaxTimestamp() < mostRecentPartitionTombstone)
 break;
 
-if (!filter.shouldInclude(sstable))
+if (!shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
 // sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
@@ -612,6 +612,17 @@ public class SinglePartitionReadCommand extends ReadCommand
 }
 }
 
+private boolean shouldInclude(SSTableReader sstable)
+{
+// If some static columns are queried, we should always include the 
sstable: the clustering values stats of the sstable
+// don't tell us if the sstable contains static values in particular.
+// TODO: we could record if a sstable contains any static value at all.
+if (!columnFilter().fetchedColumns().statics.isEmpty())
+return true;
+
+return clusteringIndexFilter().shouldInclude(sstable);
+}
+
 private boolean queryNeitherCountersNorCollections()
 {
 for (ColumnDefinition column : columnFilter().fetchedColumns())
@@ -675,6 +686,28 @@ public class SinglePartitionReadCommand extends ReadCommand
 if (filter == null)
 break;
 
+if (!shouldInclude(sstable))
+{
+// This mean that nothing queried by the filter can be in the 
sstable. One exception is the top-level partition deletion
+// however: if it is set, it impacts everything and must be 
included. Getting that top-level partition deletion costs us
+// some seek in general however (unless the partition is 
indexed and is in the key cache), so we first check if the sstable
+// has any tombstone at all as a shortcut.
+if (sstable.getSSTableMetadata().maxLocalDeletionTime == 
Integer.MAX_VALUE)
+continue; // Means no tombstone at all, we can skip that 
sstable
+
+// We need to get the partition deletion and include it if 
it's live. In any case though, we're done with that sstable.
+sstable.incrementReadCount();
+try (UnfilteredRowIterator iter = 
sstable.iterator(partitionKey(), columnFilter(), filter.isReversed(), 
isForThrift()))
+{
+if (iter.partitionLevelDeletion().isLive())
+{
+sstablesIterated++;
+result = 
add(UnfilteredRowIterators.noRowsIterator(iter.metadata(), iter.partitionKey(), 
Rows.EMPTY_STATIC_ROW, iter.partitionLevelDeletion(), filter.isReversed()), 
result, filter, sstable.isRepaired());
+   

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

[slebresne]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9280273f729ac7ee277f1f82de7129ef576de9f8
Parents: 943294b 1e4d44e
Author: Sylvain Lebresne 
Authored: Fri Nov 6 11:54:37 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 11:54:37 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 35 +++-
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 ++--
 3 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/CHANGES.txt
--
diff --cc CHANGES.txt
index 5352f22,bb8b4d2..8edb976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Skip sstable on clustering in names query (CASSANDRA-10571)
   * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
--

cassandra git commit: Skip sstable base on clustering in names query

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 925336031 -> 1e4d44e18


Skip sstable base on clustering in names query

patch by slebresne; reviewed by iamaleksey for CASSANDRA-10571


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

Branch: refs/heads/cassandra-3.0
Commit: 1e4d44e18e4cc1fd3f7e4eaf00c89ebc798e142c
Parents: 9253360
Author: Sylvain Lebresne 
Authored: Fri Oct 23 12:20:28 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 11:53:32 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 35 +++-
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 ++--
 3 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e4d44e1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c98ab..bb8b4d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Skip sstable on clustering in names query (CASSANDRA-10571)
  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)
  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e4d44e1/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java 
b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 4d7d93c..4d410a0 100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@ -527,7 +527,7 @@ public class SinglePartitionReadCommand extends ReadCommand
 if (sstable.getMaxTimestamp() < mostRecentPartitionTombstone)
 break;
 
-if (!filter.shouldInclude(sstable))
+if (!shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
 // sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
@@ -612,6 +612,17 @@ public class SinglePartitionReadCommand extends ReadCommand
 }
 }
 
+private boolean shouldInclude(SSTableReader sstable)
+{
+// If some static columns are queried, we should always include the 
sstable: the clustering values stats of the sstable
+// don't tell us if the sstable contains static values in particular.
+// TODO: we could record if a sstable contains any static value at all.
+if (!columnFilter().fetchedColumns().statics.isEmpty())
+return true;
+
+return clusteringIndexFilter().shouldInclude(sstable);
+}
+
 private boolean queryNeitherCountersNorCollections()
 {
 for (ColumnDefinition column : columnFilter().fetchedColumns())
@@ -675,6 +686,28 @@ public class SinglePartitionReadCommand extends ReadCommand
 if (filter == null)
 break;
 
+if (!shouldInclude(sstable))
+{
+// This mean that nothing queried by the filter can be in the 
sstable. One exception is the top-level partition deletion
+// however: if it is set, it impacts everything and must be 
included. Getting that top-level partition deletion costs us
+// some seek in general however (unless the partition is 
indexed and is in the key cache), so we first check if the sstable
+// has any tombstone at all as a shortcut.
+if (sstable.getSSTableMetadata().maxLocalDeletionTime == 
Integer.MAX_VALUE)
+continue; // Means no tombstone at all, we can skip that 
sstable
+
+// We need to get the partition deletion and include it if 
it's live. In any case though, we're done with that sstable.
+sstable.incrementReadCount();
+try (UnfilteredRowIterator iter = 
sstable.iterator(partitionKey(), columnFilter(), filter.isReversed(), 
isForThrift()))
+{
+if (iter.partitionLevelDeletion().isLive())
+{
+sstablesIterated++;
+result = 
add(UnfilteredRowIterators.noRowsIterator(iter.metadata(), iter.partitionKey(), 
Rows.EMPTY_STATIC_ROW, iter.partitionLevelDeletion(), filter.isReversed()), 
result, filter, 

cassandra git commit: Correct IRE message in DropTypeStatement::validate

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 1e4d44e18 -> dc7e8405b


Correct IRE message in DropTypeStatement::validate


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

Branch: refs/heads/cassandra-3.0
Commit: dc7e8405bdc7fc26bb2eb3051d13f5d35c761ac8
Parents: 1e4d44e
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 11:01:40 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 11:01:55 2015 +

--
 .../org/apache/cassandra/cql3/statements/DropTypeStatement.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc7e8405/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
index 74c8c36..d104b73 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
@@ -85,7 +85,7 @@ public class DropTypeStatement extends SchemaAlteringStatement
 
 for (UserType ut : ksm.types)
 if (!ut.name.equals(name.getUserTypeName()) && isUsedBy(ut))
-throw new InvalidRequestException(String.format("Cannot drop 
user type %s as it is still used by user type %s", name, ut.asCQL3Type()));
+throw new InvalidRequestException(String.format("Cannot drop 
user type %s as it is still used by user type %s", name, ut.getNameAsString()));
 
 for (CFMetaData cfm : ksm.tablesAndViews())
 for (ColumnDefinition def : cfm.allColumns())

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2f7bab995480611079c0c318b4d599239d5278cc
Parents: 9280273 dc7e840
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 11:02:23 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 11:02:23 2015 +

--
 .../org/apache/cassandra/cql3/statements/DropTypeStatement.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] cassandra git commit: Correct IRE message in DropTypeStatement::validate

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 9280273f7 -> 2f7bab995


Correct IRE message in DropTypeStatement::validate


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

Branch: refs/heads/trunk
Commit: dc7e8405bdc7fc26bb2eb3051d13f5d35c761ac8
Parents: 1e4d44e
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 11:01:40 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 11:01:55 2015 +

--
 .../org/apache/cassandra/cql3/statements/DropTypeStatement.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc7e8405/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
index 74c8c36..d104b73 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
@@ -85,7 +85,7 @@ public class DropTypeStatement extends SchemaAlteringStatement
 
 for (UserType ut : ksm.types)
 if (!ut.name.equals(name.getUserTypeName()) && isUsedBy(ut))
-throw new InvalidRequestException(String.format("Cannot drop 
user type %s as it is still used by user type %s", name, ut.asCQL3Type()));
+throw new InvalidRequestException(String.format("Cannot drop 
user type %s as it is still used by user type %s", name, ut.getNameAsString()));
 
 for (CFMetaData cfm : ksm.tablesAndViews())
 for (ColumnDefinition def : cfm.allColumns())

[jira] [Commented] (CASSANDRA-10662) Make UFTest.testAmokUDF non-flappy

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10662:
--

Sorry for being thick here, but that doesn't really answer my question.
That test is apparently passing on the 3.0 branch but isn't on your branch. 
That's a problem.
So maybe you're saying that the test _should_ be failing on the 3.0 branch 
because there is a genuine bug this test should be catching and that ticket 
make sure the test does catch that bug reliably? If so, that's good, but can 
you provide more detail on that genuine bug? And, if that's the case, maybe we 
can use that ticket to actually fix the bug rather than just the test?

> Make UFTest.testAmokUDF non-flappy
> --
>
> Key: CASSANDRA-10662
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10662
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
> Fix For: 3.1
>
>
> UFTest.testAmokUDF currently relies on some (strict) timeouts.



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

[2/3] cassandra git commit: Always update system keyspace to the most up-to-date version

[slebresne]

Always update system keyspace to the most up-to-date version

patch by slebresne; reviewed by carlyeks for CASSANDRA-10652


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

Branch: refs/heads/cassandra-3.0
Commit: 6367987f49a25512dbf715df9b6d564d53f27235
Parents: 801c50e
Author: Sylvain Lebresne 
Authored: Thu Nov 5 15:30:54 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:42:31 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 55 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 538d5e4..7e969a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.4
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
  * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
  * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java 
b/src/java/org/apache/cassandra/service/MigrationManager.java
index 9087672..ec7448a 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -277,12 +277,32 @@ public class MigrationManager
 
 public static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally) throws ConfigurationException
 {
+announceNewColumnFamily(cfm, announceLocally, true);
+}
+
+/**
+ * Announces the table even if the definition is already know locally.
+ * This should generally be avoided but is used internally when we want to 
force the most up to date version of
+ * a system table schema (Note that we don't know if the schema we force 
_is_ the most recent version or not, we
+ * just rely on idempotency to basically ignore that announce if it's not. 
That's why we can't use announceUpdateColumnFamily,
+ * it would for instance delete new columns if this is not called with the 
most up-to-date version)
+ *
+ * Note that this is only safe for system tables where we know the cfId is 
fixed and will be the same whatever version
+ * of the definition is used.
+ */
+public static void forceAnnounceNewColumnFamily(CFMetaData cfm) throws 
ConfigurationException
+{
+announceNewColumnFamily(cfm, false, false);
+}
+
+private static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally, boolean throwOnDuplicate) throws ConfigurationException
+{
 cfm.validate();
 
 KSMetaData ksm = Schema.instance.getKSMetaData(cfm.ksName);
 if (ksm == null)
 throw new ConfigurationException(String.format("Cannot add table 
'%s' to non existing keyspace '%s'.", cfm.cfName, cfm.ksName));
-else if (ksm.cfMetaData().containsKey(cfm.cfName))
+else if (throwOnDuplicate && ksm.cfMetaData().containsKey(cfm.cfName))
 throw new AlreadyExistsException(cfm.ksName, cfm.cfName);
 
 logger.info(String.format("Create new table: %s", cfm));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 77483f2..ad209fc 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -950,11 +950,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 
 // if we don't have system_traces keyspace at this point, then create 
it manually
-if (Schema.instance.getKSMetaData(TraceKeyspace.NAME) == null)
-maybeAddKeyspace(TraceKeyspace.definition());
-
-if (Schema.instance.getKSMetaData(SystemDistributedKeyspace.NAME) == 
null)
-
MigrationManager.announceNewKeyspace(SystemDistributedKeyspace.definition(), 0, 
false);
+

[jira] [Updated] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10476:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging
> {code}



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

[jira] [Updated] (CASSANDRA-9069) debug-cql broken in trunk

[Robert Stupp (JIRA)]

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

Robert Stupp updated CASSANDRA-9069:

Assignee: Robert Stupp

> debug-cql broken in trunk
> -
>
> Key: CASSANDRA-9069
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9069
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
> Fix For: 3.1
>
>
> {{debug-cql}} is broken on trunk.
> At startup it just says:
> {code}
> Error: Exception thrown by the agent : java.lang.NullPointerException
> {code}
> That exception originates from JMX agent (which cannot bind).
> It can be reproduced by starting C* locally and starting {{debug-cql}}.
> Workaround is to comment out sourcing of {{cassandra-env.sh}}.



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

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

[slebresne]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5c97de91bb6d35dceb732a2924f9301f44d7989f
Parents: 2f7bab9 962aa2b
Author: Sylvain Lebresne 
Authored: Fri Nov 6 12:14:14 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 12:14:14 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c97de91/CHANGES.txt
--
diff --cc CHANGES.txt
index 8edb976,6d26afa..6936bf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
   * Skip sstable on clustering in names query (CASSANDRA-10571)
   * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)

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

[1/2] cassandra git commit: Fix distinct queries in mixed version clusters

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 2f7bab995 -> 5c97de91b


Fix distinct queries in mixed version clusters

patch by blerer; reviewed by slebresne for CASSANDRA-10573


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

Branch: refs/heads/trunk
Commit: 962aa2b5cce685f32b106d70df35e66ea46e6817
Parents: dc7e840
Author: Benjamin Lerer 
Authored: Fri Nov 6 12:11:55 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 12:13:49 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/962aa2b5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index bb8b4d2..6d26afa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
  * Skip sstable on clustering in names query (CASSANDRA-10571)
  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/962aa2b5/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java 
b/src/java/org/apache/cassandra/db/ReadCommand.java
index ace5e1e..301cb86 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -922,8 +922,10 @@ public abstract class ReadCommand implements ReadQuery
 static ColumnFilter getColumnSelectionForSlice(boolean selectsStatics, 
int compositesToGroup, CFMetaData metadata)
 {
 // A value of -2 indicates this is a DISTINCT query that doesn't 
select static columns, only partition keys.
+// In that case, we'll basically be querying the first row of the 
partition, but we must make sure we include
+// all columns so we get at least one cell if there is a live row 
as it would confuse pre-3.0 nodes otherwise.
 if (compositesToGroup == -2)
-return ColumnFilter.selection(PartitionColumns.NONE);
+return ColumnFilter.all(metadata);
 
 // if a slice query from a pre-3.0 node doesn't cover statics, we 
shouldn't select them at all
 PartitionColumns columns = selectsStatics

[1/3] cassandra git commit: Always update system keyspace to the most up-to-date version

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5c97de91b -> a177502b8


Always update system keyspace to the most up-to-date version

patch by slebresne; reviewed by carlyeks for CASSANDRA-10652


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

Branch: refs/heads/trunk
Commit: 6367987f49a25512dbf715df9b6d564d53f27235
Parents: 801c50e
Author: Sylvain Lebresne 
Authored: Thu Nov 5 15:30:54 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:42:31 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 55 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 538d5e4..7e969a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.4
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
  * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
  * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java 
b/src/java/org/apache/cassandra/service/MigrationManager.java
index 9087672..ec7448a 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -277,12 +277,32 @@ public class MigrationManager
 
 public static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally) throws ConfigurationException
 {
+announceNewColumnFamily(cfm, announceLocally, true);
+}
+
+/**
+ * Announces the table even if the definition is already know locally.
+ * This should generally be avoided but is used internally when we want to 
force the most up to date version of
+ * a system table schema (Note that we don't know if the schema we force 
_is_ the most recent version or not, we
+ * just rely on idempotency to basically ignore that announce if it's not. 
That's why we can't use announceUpdateColumnFamily,
+ * it would for instance delete new columns if this is not called with the 
most up-to-date version)
+ *
+ * Note that this is only safe for system tables where we know the cfId is 
fixed and will be the same whatever version
+ * of the definition is used.
+ */
+public static void forceAnnounceNewColumnFamily(CFMetaData cfm) throws 
ConfigurationException
+{
+announceNewColumnFamily(cfm, false, false);
+}
+
+private static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally, boolean throwOnDuplicate) throws ConfigurationException
+{
 cfm.validate();
 
 KSMetaData ksm = Schema.instance.getKSMetaData(cfm.ksName);
 if (ksm == null)
 throw new ConfigurationException(String.format("Cannot add table 
'%s' to non existing keyspace '%s'.", cfm.cfName, cfm.ksName));
-else if (ksm.cfMetaData().containsKey(cfm.cfName))
+else if (throwOnDuplicate && ksm.cfMetaData().containsKey(cfm.cfName))
 throw new AlreadyExistsException(cfm.ksName, cfm.cfName);
 
 logger.info(String.format("Create new table: %s", cfm));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6367987f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 77483f2..ad209fc 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -950,11 +950,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 
 // if we don't have system_traces keyspace at this point, then create 
it manually
-if (Schema.instance.getKSMetaData(TraceKeyspace.NAME) == null)
-maybeAddKeyspace(TraceKeyspace.definition());
-
-if (Schema.instance.getKSMetaData(SystemDistributedKeyspace.NAME) == 
null)
-

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

[slebresne]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 57d56bd1c2ce28722667221b553a8f505d9eee77
Parents: 962aa2b 6367987
Author: Sylvain Lebresne 
Authored: Fri Nov 6 14:52:23 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:52:23 2015 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 56 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d56bd1/CHANGES.txt
--
diff --cc CHANGES.txt
index 6d26afa,7e969a5..a72cab2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.4
 +3.0
 + * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
 + * Skip sstable on clustering in names query (CASSANDRA-10571)
 + * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
 + * Fix bootstrapping with MVs (CASSANDRA-10621)
 + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
 + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
 + * Fix reading of legacy sstables (CASSANDRA-10590)
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
+  * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+  * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d56bd1/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 6a21f91,ec7448a..b7f9bf3
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -290,13 -277,32 +290,33 @@@ public class MigrationManage
  
  public static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally) throws ConfigurationException
  {
+ announceNewColumnFamily(cfm, announceLocally, true);
+ }
+ 
+ /**
+  * Announces the table even if the definition is already know locally.
+  * 

[1/3] cassandra git commit: Fix distinct queries in mixed version clusters

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 dc7e8405b -> 57d56bd1c


Fix distinct queries in mixed version clusters

patch by blerer; reviewed by slebresne for CASSANDRA-10573


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

Branch: refs/heads/cassandra-3.0
Commit: 962aa2b5cce685f32b106d70df35e66ea46e6817
Parents: dc7e840
Author: Benjamin Lerer 
Authored: Fri Nov 6 12:11:55 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 12:13:49 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/962aa2b5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index bb8b4d2..6d26afa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
  * Skip sstable on clustering in names query (CASSANDRA-10571)
  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
  * Fix bootstrapping with MVs (CASSANDRA-10621)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/962aa2b5/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java 
b/src/java/org/apache/cassandra/db/ReadCommand.java
index ace5e1e..301cb86 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -922,8 +922,10 @@ public abstract class ReadCommand implements ReadQuery
 static ColumnFilter getColumnSelectionForSlice(boolean selectsStatics, 
int compositesToGroup, CFMetaData metadata)
 {
 // A value of -2 indicates this is a DISTINCT query that doesn't 
select static columns, only partition keys.
+// In that case, we'll basically be querying the first row of the 
partition, but we must make sure we include
+// all columns so we get at least one cell if there is a live row 
as it would confuse pre-3.0 nodes otherwise.
 if (compositesToGroup == -2)
-return ColumnFilter.selection(PartitionColumns.NONE);
+return ColumnFilter.all(metadata);
 
 // if a slice query from a pre-3.0 node doesn't cover statics, we 
shouldn't select them at all
 PartitionColumns columns = selectsStatics

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

[slebresne]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a177502b8f9e5ebbf19b8bbfcbe12f4497f0e9bb
Parents: 5c97de9 57d56bd
Author: Sylvain Lebresne 
Authored: Fri Nov 6 14:52:40 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:52:40 2015 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 56 insertions(+), 24 deletions(-)
--


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

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

[slebresne]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 57d56bd1c2ce28722667221b553a8f505d9eee77
Parents: 962aa2b 6367987
Author: Sylvain Lebresne 
Authored: Fri Nov 6 14:52:23 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:52:23 2015 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 56 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d56bd1/CHANGES.txt
--
diff --cc CHANGES.txt
index 6d26afa,7e969a5..a72cab2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.4
 +3.0
 + * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
 + * Skip sstable on clustering in names query (CASSANDRA-10571)
 + * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
 + * Fix bootstrapping with MVs (CASSANDRA-10621)
 + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
 + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
 + * Fix reading of legacy sstables (CASSANDRA-10590)
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
+  * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+  * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d56bd1/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 6a21f91,ec7448a..b7f9bf3
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -290,13 -277,32 +290,33 @@@ public class MigrationManage
  
  public static void announceNewColumnFamily(CFMetaData cfm, boolean 
announceLocally) throws ConfigurationException
  {
+ announceNewColumnFamily(cfm, announceLocally, true);
+ }
+ 
+ /**
+  * Announces the table even if the definition is already know locally.
+  * This 

[jira] [Updated] (CASSANDRA-10592) IllegalArgumentException in DataOutputBuffer.reallocate

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko updated CASSANDRA-10592:
--
Fix Version/s: (was: 3.0.0)
   (was: 2.2.4)
   3.1
   2.2.x

> IllegalArgumentException in DataOutputBuffer.reallocate
> ---
>
> Key: CASSANDRA-10592
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10592
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sebastian Estevez
>Assignee: Ariel Weisberg
> Fix For: 2.2.x, 3.1
>
>
> CORRECTION-
> It turns out the exception occurs when running a read using a thrift jdbc 
> driver. Once you have loaded the data with stress below, run 
> SELECT * FROM "autogeneratedtest"."transaction_by_retailer" using this tool - 
> http://www.aquafold.com/aquadatastudio_downloads.html
>  
> The exception:
> {code}
> WARN  [SharedPool-Worker-1] 2015-10-22 12:58:20,792 
> AbstractTracingAwareExecutorService.java:169 - Uncaught exception on thread 
> Thread[SharedPool-Worker-1,5,main]: {}
> java.lang.RuntimeException: java.lang.IllegalArgumentException
>   at 
> org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2366)
>  ~[main/:na]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_60]
>   at 
> org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
>  ~[main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_60]
> Caused by: java.lang.IllegalArgumentException: null
>   at java.nio.ByteBuffer.allocate(ByteBuffer.java:334) ~[na:1.8.0_60]
>   at 
> org.apache.cassandra.io.util.DataOutputBuffer.reallocate(DataOutputBuffer.java:63)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.DataOutputBuffer.doFlush(DataOutputBuffer.java:57)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.BufferedDataOutputStreamPlus.write(BufferedDataOutputStreamPlus.java:132)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.BufferedDataOutputStreamPlus.write(BufferedDataOutputStreamPlus.java:151)
>  ~[main/:na]
>   at 
> org.apache.cassandra.utils.ByteBufferUtil.writeWithVIntLength(ByteBufferUtil.java:296)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.marshal.AbstractType.writeValue(AbstractType.java:374)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.BufferCell$Serializer.serialize(BufferCell.java:263)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:183)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:108)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:96)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:132)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:87)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:77)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.partitions.UnfilteredPartitionIterators$Serializer.serialize(UnfilteredPartitionIterators.java:381)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.build(ReadResponse.java:136)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:128)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:123)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse.createDataResponse(ReadResponse.java:65) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadCommand.createResponse(ReadCommand.java:289) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1697)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2362)
>  ~[main/:na]
>   ... 4 common frames omitted
> {code}
> I was running this command:
> {code}
> tools/bin/cassandra-stress user 
> profile=~/Desktop/startup/stress/stress.yaml n=10 ops\(insert=1\) -rate 
> threads=30
> {code}
> Here's the stress.yaml UPDATED!
> {code}
> ### DML ### THIS IS UNDER CONSTRUCTION!!!
> # Keyspace Name
> keyspace: autogeneratedtest
> # The CQL for creating a keyspace (optional if it already exists)
> keyspace_definition: |
>   CREATE KEYSPACE 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 59a32211a01c6eb2ae694da0161006332a143947
Parents: f8783b7 ff9b6bb
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:21:28 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:21:28 2015 +

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/tools/SSTableImport.java |  5 +
 .../org/apache/cassandra/tools/SSTableImportTest.java | 14 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/CHANGES.txt
--
diff --cc CHANGES.txt
index f47e1dd,8ff726e..814a924
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.1.12
 +2.2.4
 + * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/src/java/org/apache/cassandra/tools/SSTableImport.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --cc test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index 814662c,77036e8..5eaf154
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@@ -57,32 -46,20 +57,40 @@@ import org.apache.cassandra.db.columnit
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.marshal.AsciiType;
  import org.apache.cassandra.db.marshal.BytesType;
 +import org.apache.cassandra.db.marshal.CounterColumnType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.Descriptor;
 -import org.apache.cassandra.io.sstable.SSTableReader;
 +import org.apache.cassandra.locator.SimpleStrategy;
- import org.apache.thrift.TException;
  
 -public class SSTableImportTest extends SchemaLoader
 +public class SSTableImportTest
  {
 +public static final String KEYSPACE1 = "SSTableImportTest";
 +public static final String CF_STANDARD = "Standard1";
 +public static final String CF_COUNTER = "Counter1";
 +public static final String CQL_TABLE = "table1";
 +
 +@BeforeClass
 +public static void defineSchema() throws ConfigurationException
 +{
 +SchemaLoader.prepareServer();
 +SchemaLoader.createKeyspace(KEYSPACE1,
 +SimpleStrategy.class,
 +KSMetaData.optsWithRF(1),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_COUNTER).defaultValidator(CounterColumnType.instance),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
"AsciiKeys").keyValidator(AsciiType.instance),
 +CFMetaData.compile("CREATE TABLE table1 
(k int PRIMARY KEY, v1 text, v2 int)", KEYSPACE1));
 +}
 +
+ @Test(expected = IllegalArgumentException.class)
+ public void testImportUnknownCf() throws IOException, URISyntaxException
+ {
+ // Import JSON to temp SSTable file
+ String jsonUrl = resourcePath("SimpleCF.json");
+ File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+ new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+ }
+ 
  @Test
  public void testImportSimpleCf() throws IOException, URISyntaxException
  {
@@@ -250,8 -229,8 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 59a32211a01c6eb2ae694da0161006332a143947
Parents: f8783b7 ff9b6bb
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:21:28 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:21:28 2015 +

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/tools/SSTableImport.java |  5 +
 .../org/apache/cassandra/tools/SSTableImportTest.java | 14 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/CHANGES.txt
--
diff --cc CHANGES.txt
index f47e1dd,8ff726e..814a924
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.1.12
 +2.2.4
 + * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/src/java/org/apache/cassandra/tools/SSTableImport.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --cc test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index 814662c,77036e8..5eaf154
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@@ -57,32 -46,20 +57,40 @@@ import org.apache.cassandra.db.columnit
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.marshal.AsciiType;
  import org.apache.cassandra.db.marshal.BytesType;
 +import org.apache.cassandra.db.marshal.CounterColumnType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.Descriptor;
 -import org.apache.cassandra.io.sstable.SSTableReader;
 +import org.apache.cassandra.locator.SimpleStrategy;
- import org.apache.thrift.TException;
  
 -public class SSTableImportTest extends SchemaLoader
 +public class SSTableImportTest
  {
 +public static final String KEYSPACE1 = "SSTableImportTest";
 +public static final String CF_STANDARD = "Standard1";
 +public static final String CF_COUNTER = "Counter1";
 +public static final String CQL_TABLE = "table1";
 +
 +@BeforeClass
 +public static void defineSchema() throws ConfigurationException
 +{
 +SchemaLoader.prepareServer();
 +SchemaLoader.createKeyspace(KEYSPACE1,
 +SimpleStrategy.class,
 +KSMetaData.optsWithRF(1),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_COUNTER).defaultValidator(CounterColumnType.instance),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
"AsciiKeys").keyValidator(AsciiType.instance),
 +CFMetaData.compile("CREATE TABLE table1 
(k int PRIMARY KEY, v1 text, v2 int)", KEYSPACE1));
 +}
 +
+ @Test(expected = IllegalArgumentException.class)
+ public void testImportUnknownCf() throws IOException, URISyntaxException
+ {
+ // Import JSON to temp SSTable file
+ String jsonUrl = resourcePath("SimpleCF.json");
+ File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+ new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+ }
+ 
  @Test
  public void testImportSimpleCf() throws IOException, URISyntaxException
  {
@@@ -250,8 -229,8 

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 735bd65d208c32d331c674c8cb37ae1a07879260
Parents: a2c14f8 7fd2eaa
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:23:19 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:23:19 2015 +

--

--

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7fd2eaa727bbacf6a3cea8d41e02e804bf9cdd56
Parents: 97dc8d5 59a3221
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:22:44 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:22:44 2015 +

--

--

[1/4] cassandra git commit: Improve json2sstable error reporting on nonexistent columns

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk a2c14f852 -> 735bd65d2


Improve json2sstable error reporting on nonexistent columns

patch by Paulo Motta; reviewed by Ariel Weisberg for CASSANDRA-10401


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

Branch: refs/heads/trunk
Commit: ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5
Parents: 2548365
Author: Paulo Motta 
Authored: Mon Oct 5 15:04:09 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:19:13 2015 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/SSTableImport.java  | 5 +
 test/unit/org/apache/cassandra/tools/SSTableImportTest.java | 9 +
 3 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7771969..8ff726e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
  * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 87d52be..e0f3ef3 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -281,6 +281,11 @@ public class SSTableImport
  */
 public int importJson(String jsonFile, String keyspace, String cf, String 
ssTablePath) throws IOException
 {
+if (Schema.instance.getCFMetaData(keyspace, cf) == null)
+throw new IllegalArgumentException(String.format("Unknown 
keyspace/table %s.%s",
+ keyspace,
+ cf));
+
 ColumnFamily columnFamily = 
ArrayBackedSortedColumns.factory.create(keyspace, cf);
 IPartitioner partitioner = DatabaseDescriptor.getPartitioner();
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index a5f05f8..77036e8 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -51,6 +51,15 @@ import org.apache.cassandra.io.sstable.SSTableReader;
 
 public class SSTableImportTest extends SchemaLoader
 {
+@Test(expected = IllegalArgumentException.class)
+public void testImportUnknownCf() throws IOException, URISyntaxException
+{
+// Import JSON to temp SSTable file
+String jsonUrl = resourcePath("SimpleCF.json");
+File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+}
+
 @Test
 public void testImportSimpleCf() throws IOException, URISyntaxException
 {

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 59a32211a01c6eb2ae694da0161006332a143947
Parents: f8783b7 ff9b6bb
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:21:28 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:21:28 2015 +

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/tools/SSTableImport.java |  5 +
 .../org/apache/cassandra/tools/SSTableImportTest.java | 14 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/CHANGES.txt
--
diff --cc CHANGES.txt
index f47e1dd,8ff726e..814a924
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.1.12
 +2.2.4
 + * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/src/java/org/apache/cassandra/tools/SSTableImport.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a32211/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --cc test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index 814662c,77036e8..5eaf154
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@@ -57,32 -46,20 +57,40 @@@ import org.apache.cassandra.db.columnit
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.marshal.AsciiType;
  import org.apache.cassandra.db.marshal.BytesType;
 +import org.apache.cassandra.db.marshal.CounterColumnType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.Descriptor;
 -import org.apache.cassandra.io.sstable.SSTableReader;
 +import org.apache.cassandra.locator.SimpleStrategy;
- import org.apache.thrift.TException;
  
 -public class SSTableImportTest extends SchemaLoader
 +public class SSTableImportTest
  {
 +public static final String KEYSPACE1 = "SSTableImportTest";
 +public static final String CF_STANDARD = "Standard1";
 +public static final String CF_COUNTER = "Counter1";
 +public static final String CQL_TABLE = "table1";
 +
 +@BeforeClass
 +public static void defineSchema() throws ConfigurationException
 +{
 +SchemaLoader.prepareServer();
 +SchemaLoader.createKeyspace(KEYSPACE1,
 +SimpleStrategy.class,
 +KSMetaData.optsWithRF(1),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_COUNTER).defaultValidator(CounterColumnType.instance),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
"AsciiKeys").keyValidator(AsciiType.instance),
 +CFMetaData.compile("CREATE TABLE table1 
(k int PRIMARY KEY, v1 text, v2 int)", KEYSPACE1));
 +}
 +
+ @Test(expected = IllegalArgumentException.class)
+ public void testImportUnknownCf() throws IOException, URISyntaxException
+ {
+ // Import JSON to temp SSTable file
+ String jsonUrl = resourcePath("SimpleCF.json");
+ File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+ new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+ }
+ 
  @Test
  public void testImportSimpleCf() throws IOException, URISyntaxException
  {
@@@ -250,8 -229,8 +258,8 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7fd2eaa727bbacf6a3cea8d41e02e804bf9cdd56
Parents: 97dc8d5 59a3221
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:22:44 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:22:44 2015 +

--

--

[1/3] cassandra git commit: Improve json2sstable error reporting on nonexistent columns

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 97dc8d525 -> 7fd2eaa72


Improve json2sstable error reporting on nonexistent columns

patch by Paulo Motta; reviewed by Ariel Weisberg for CASSANDRA-10401


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

Branch: refs/heads/cassandra-3.0
Commit: ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5
Parents: 2548365
Author: Paulo Motta 
Authored: Mon Oct 5 15:04:09 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:19:13 2015 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/SSTableImport.java  | 5 +
 test/unit/org/apache/cassandra/tools/SSTableImportTest.java | 9 +
 3 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7771969..8ff726e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
  * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 87d52be..e0f3ef3 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -281,6 +281,11 @@ public class SSTableImport
  */
 public int importJson(String jsonFile, String keyspace, String cf, String 
ssTablePath) throws IOException
 {
+if (Schema.instance.getCFMetaData(keyspace, cf) == null)
+throw new IllegalArgumentException(String.format("Unknown 
keyspace/table %s.%s",
+ keyspace,
+ cf));
+
 ColumnFamily columnFamily = 
ArrayBackedSortedColumns.factory.create(keyspace, cf);
 IPartitioner partitioner = DatabaseDescriptor.getPartitioner();
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index a5f05f8..77036e8 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -51,6 +51,15 @@ import org.apache.cassandra.io.sstable.SSTableReader;
 
 public class SSTableImportTest extends SchemaLoader
 {
+@Test(expected = IllegalArgumentException.class)
+public void testImportUnknownCf() throws IOException, URISyntaxException
+{
+// Import JSON to temp SSTable file
+String jsonUrl = resourcePath("SimpleCF.json");
+File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+}
+
 @Test
 public void testImportSimpleCf() throws IOException, URISyntaxException
 {

[jira] [Commented] (CASSANDRA-10401) Improve json2sstable error reporting on nonexistent column

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10401:
---

Committed as 
[ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5|https://github.com/apache/cassandra/commit/ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5]
 to 2.1 and merged with 2.2, thanks.

> Improve json2sstable error reporting on nonexistent column
> --
>
> Key: CASSANDRA-10401
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10401
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra 2.1.8.621
>Reporter: Jose Martinez Poblete
>Assignee: Paulo Motta
> Fix For: 2.2.4, 2.1.12
>
>
> We have the following table...
> {noformat}
> CREATE TABLE keyspace_name.table_name (
> col1 text,
> col2 text,
> col3 text,
> col4 text,
> PRIMARY KEY ((col1, col2), col3)
> ) WITH CLUSTERING ORDER BY (col3 ASC)
> {noformat}
> And the following  json in a file created from sstable2json tool
> {noformat}
> [
> {"key": "This is col1:This is col2,
>  "cells": [["This is col3:","",1443217787319002],
>["This is col3:"col4","This is col4",1443217787319002]]}
> ]
> {noformat}
> Let's say we deleted that record form the DB and wanted to bring it back
> If we try to create an sstable from this data in a json file named 
> test_file.json, we get a NPE 
> {noformat}
> -bash-4.1$ json2sstable -K elp -c table_name-3264cbe063c211e5bc34e746786b7b29 
> test_file.json  
> /var/lib/cassandra/data/keyspace_name/table_name-3264cbe063c211e5bc34e746786b7b29/keyspace_name-table_name-ka-1-Data.db
> Importing 1 keys...
> java.lang.NullPointerException
>   at 
> org.apache.cassandra.tools.SSTableImport.getKeyValidator(SSTableImport.java:442)
>   at 
> org.apache.cassandra.tools.SSTableImport.importUnsorted(SSTableImport.java:316)
>   at 
> org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:287)
>   at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:514)
> ERROR: null
> -bash-4.1$
> {noformat}



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

[jira] [Commented] (CASSANDRA-10614) AssertionError while flushing memtables

[T Jake Luciani (JIRA)]

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

T Jake Luciani commented on CASSANDRA-10614:


Ok since we can't get dtests to run on cassci I ran the mv dtests on my box and 
all is OK I'll squash and commit shortly

{code}
➜  cassandra-dtest git:(master) ✗ nosetests -v -s -x materialized_views_test.py 

/usr/lib/python2.7/dist-packages/pkg_resources/__init__.py:1224: UserWarning: 
/home/jake/.python-eggs is writable by group/others and vulnerable to attack 
when used with get_resource_filename. Consider a more secure location (set with 
.set_extraction_path or the PYTHON_EGG_CACHE environment variable).
  warnings.warn(msg, UserWarning)
add_dc_after_mv_network_replication_test 
(materialized_views_test.TestMaterializedViews) ... ok
add_dc_after_mv_simple_replication_test 
(materialized_views_test.TestMaterializedViews) ... ok
add_node_after_mv_test (materialized_views_test.TestMaterializedViews) ... ok
add_write_survey_node_after_mv_test 
(materialized_views_test.TestMaterializedViews) ... ok
allow_filtering_test (materialized_views_test.TestMaterializedViews) ... ok
base_replica_repair_test (materialized_views_test.TestMaterializedViews) ... ok
clustering_column_test (materialized_views_test.TestMaterializedViews) ... ok
complex_mv_select_statements_test 
(materialized_views_test.TestMaterializedViews) ... ok
complex_repair_test (materialized_views_test.TestMaterializedViews) ... ok
crc_check_chance_test (materialized_views_test.TestMaterializedViews) ... ok
create_test (materialized_views_test.TestMaterializedViews) ... ok
drop_column_test (materialized_views_test.TestMaterializedViews) ... ok
drop_mv_test (materialized_views_test.TestMaterializedViews) ... ok
drop_table_test (materialized_views_test.TestMaterializedViews) ... ok
immutable_test (materialized_views_test.TestMaterializedViews) ... ok
insert_test (materialized_views_test.TestMaterializedViews) ... ok
interrupt_build_process_test (materialized_views_test.TestMaterializedViews) 
... ok
lwt_test (materialized_views_test.TestMaterializedViews) ... ok
populate_mv_after_insert_test (materialized_views_test.TestMaterializedViews) 
... ok
prepared_statement_test (materialized_views_test.TestMaterializedViews) ... ok
query_all_new_column_test (materialized_views_test.TestMaterializedViews) ... ok
query_new_column_test (materialized_views_test.TestMaterializedViews) ... ok
really_complex_repair_test (materialized_views_test.TestMaterializedViews) ... 
ok
secondary_index_test (materialized_views_test.TestMaterializedViews) ... ok
simple_repair_test (materialized_views_test.TestMaterializedViews) ... ok
test_gcgs_validation (materialized_views_test.TestMaterializedViews) ... ok
ttl_test (materialized_views_test.TestMaterializedViews) ... ok
On 10; match: 400; extra: 0; missing: 
0ized_views_test.TestMaterializedViewsConsistency) ... 
ok

--
Ran 28 tests in 1573.211s

OK

{code}

> AssertionError while flushing memtables
> ---
>
> Key: CASSANDRA-10614
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10614
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Tyler Hobbs
>Assignee: Tyler Hobbs
>Priority: Critical
> Fix For: 3.0.0
>
> Attachments: debug.log, system.log
>
>
> While running mvbench against a single local node, I noticed this stacktrace 
> showing up multiple times in the logs:
> {noformat}
> ERROR 16:40:01 Exception in thread Thread[MemtableFlushWriter:1,5,main]
> java.lang.AssertionError: null
>   at org.apache.cassandra.db.rows.Rows.collectStats(Rows.java:70) 
> ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.format.big.BigTableWriter$StatsCollector.applyToRow(BigTableWriter.java:197)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.transform.BaseRows.hasNext(BaseRows.java:116) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.transform.UnfilteredRows.isEmpty(UnfilteredRows.java:38)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ColumnIndex.writeAndBuildIndex(ColumnIndex.java:49) 
> ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.format.big.BigTableWriter.append(BigTableWriter.java:149)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.SimpleSSTableMultiWriter.append(SimpleSSTableMultiWriter.java:45)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.SSTableTxnWriter.append(SSTableTxnWriter.java:52)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:389)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.Memtable$FlushRunnable.runMayThrow(Memtable.java:352) 
> ~[main/:na]

[jira] [Updated] (CASSANDRA-10670) Stress tool isn't working with tables not having non-primary keys

[Arunsandu (JIRA)]

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

Arunsandu updated CASSANDRA-10670:
--
Reproduced In: 2.2.2, 2.1.8  (was: 2.1.8, 2.2.2)
   Tester: Ian Holsman

> Stress tool isn't working with tables not having non-primary keys
> -
>
> Key: CASSANDRA-10670
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10670
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing, Tools
>Reporter: Arunsandu
>  Labels: performance, test
> Fix For: 2.1.8, 2.2.2
>
> Attachments: Error.jpg, request_trace.yaml
>
>   Original Estimate: 226h
>  Remaining Estimate: 226h
>
> Hi,
> I am trying to pass request_trace.yaml as an input to the stress-tool as 
> below:
> ./cassandra-stress user profile=request_trace.yaml n=100 
> ops(likelyquery0=1,likelyquery1=2,insert=1) -node 10.32.100.16
> the script is perfectly working fine for the other tables. But I get the 
> below error for request_trace table. Please check the request_trace.yaml file 
> for the script. 
> This stress tool command throws error only when the table has single 
> partition key as described above. In all the other cases where the table has 
> non primary keys, am able to run the command and get the results.
>  ```
> - 
> request_trace.yaml-
> DML ### THIS IS UNDER CONSTRUCTION!!!
> Keyspace Name
> keyspace: autogeneratedtest
> The CQL for creating a keyspace (optional if it already exists)
> keyspace_definition: |
> CREATE KEYSPACE autogeneratedtest WITH replication = {'class': 
> 'SimpleStrategy', 'replication_factor': 1};
> Table name
> table: request_trace
> The CQL for creating a table you wish to stress (optional if it already 
> exists)
> table_definition:
> CREATE TABLE request_trace (
> service_context_id text,
> trace_statement text,
> PRIMARY KEY (service_context_id, trace_statement)
> )
> Column Distribution Specifications
> columnspec:
> name: service_context_id
> size: gaussian(10..20)
> population: gaussian(300..500)
> name: trace_statement
> size: gaussian(5..15)
> population: gaussian(800..1000)
> Batch Ratio Distribution Specifications
> insert:
> partitions: fixed(1) # Our partition key is the domain so only insert one per 
> batch
> select: fixed(1)/1000 # We have 1000 posts per domain so 1/1000 will allow 1 
> post per batch
> batchtype: UNLOGGED # Unlogged batches
> A list of queries you wish to run against the schema
> #
> queries:
> likelyquery0:
> cql: SELECT * FROM request_trace WHERE service_context_id = ?
> fields: samerow
> likelyquery1:
> cql: SELECT * FROM request_trace WHERE service_context_id = ? AND 
> trace_statement = ?
> fields: samerow
>  ```
>  ```
> ERROR:
> Warming up likelyquery0 with 5 iterations...
> Warming up likelyquery1 with 5 iterations...
> Warming up insert with 5 iterations...
> Generating batches with [1..1] partitions and [0..0] rows (of [1..1] total 
> rows in the partitions)
> Exception in thread "main" com.datastax.driver.core.exceptions.SyntaxError: 
> line 1:28 no viable alternative at input 'WHERE' (UPDATE "request_trace" SET  
> [WHERE]...)
> at 
> com.datastax.driver.core.exceptions.SyntaxError.copy(SyntaxError.java:35)
> at 
> com.datastax.driver.core.DefaultResultSetFuture.extractCauseFromExecutionException(DefaultResultSetFuture.java:271)
> at 
> com.datastax.driver.core.AbstractSession.prepare(AbstractSession.java:82)
> at 
> org.apache.cassandra.stress.util.JavaDriverClient.prepare(JavaDriverClient.java:84)
> at 
> org.apache.cassandra.stress.StressProfile.getInsert(StressProfile.java:396)
> at 
> org.apache.cassandra.stress.settings.SettingsCommandUser$1.get(SettingsCommandUser.java:82)
> at 
> org.apache.cassandra.stress.settings.SettingsCommandUser$1.get(SettingsCommandUser.java:78)
> at 
> org.apache.cassandra.stress.operations.SampledOpDistributionFactory$1.get(SampledOpDistributionFactory.java:80)
> at 
> org.apache.cassandra.stress.StressAction$Consumer.(StressAction.java:269)
> at org.apache.cassandra.stress.StressAction.run(StressAction.java:204)
> at org.apache.cassandra.stress.StressAction.warmup(StressAction.java:105)
> at org.apache.cassandra.stress.StressAction.run(StressAction.java:61)
> at org.apache.cassandra.stress.Stress.main(Stress.java:114)
> Caused by: com.datastax.driver.core.exceptions.SyntaxError: line 1:28 no 
> viable alternative at input 'WHERE' (UPDATE "request_trace" SET  [WHERE]...)
> at 
> com.datastax.driver.core.Responses$Error.asException(Responses.java:123)
> at 
> com.datastax.driver.core.SessionManager$1.apply(SessionManager.java:167)
> at 
> 

cassandra git commit: Fix AssertionError while flushing memtable due to materialized views incorrectly inserting empty rows

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 7fd2eaa72 -> 2998bb3cc


Fix AssertionError while flushing memtable due to materialized views 
incorrectly inserting empty rows

Patch by thobbs; reviewed by tjake for CASSANDRA-10614


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

Branch: refs/heads/cassandra-3.0
Commit: 2998bb3cc45cf5e7225d0cb1ee7cfbd13e3edb57
Parents: 7fd2eaa
Author: Tyler Hobbs 
Authored: Wed Oct 28 14:33:10 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:32:51 2015 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/view/TemporalRow.java   | 31 +++
 src/java/org/apache/cassandra/db/view/View.java | 24 ---
 .../cassandra/cql3/ViewFilteringTest.java   | 14 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 42 
 5 files changed, 108 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 53e1e4a..3662e6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.0
+ * Fix AssertionError while flushing memtable due to materialized views
+   incorrectly inserting empty rows (CASSANDRA-10614)
  * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
  * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
  * Fix distinct queries in mixed version cluster (CASSANDRA-10573)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/src/java/org/apache/cassandra/db/view/TemporalRow.java
--
diff --git a/src/java/org/apache/cassandra/db/view/TemporalRow.java 
b/src/java/org/apache/cassandra/db/view/TemporalRow.java
index d876b00..01da6e7 100644
--- a/src/java/org/apache/cassandra/db/view/TemporalRow.java
+++ b/src/java/org/apache/cassandra/db/view/TemporalRow.java
@@ -243,6 +243,16 @@ public class TemporalRow
 row.addColumnValue(column, path, newCell.timestamp, 
newCell.ttl,
newCell.localDeletionTime, 
newCell.value, newCell.isNew);
 }
+
+@Override
+public String toString()
+{
+return MoreObjects.toStringHelper(this)
+.add("numSet", numSet)
+.add("existingCell", existingCell)
+.add("newCell", newCell)
+.toString();
+}
 }
 }
 
@@ -286,6 +296,22 @@ public class TemporalRow
 }
 
 @Override
+public String toString()
+{
+return MoreObjects.toStringHelper(this)
+.add("table", baseCfs.keyspace.getName() + "." + 
baseCfs.getTableName())
+.add("basePartitionKey", 
ByteBufferUtil.bytesToHex(basePartitionKey))
+.add("startRow", startRow.toString(baseCfs.metadata))
+.add("startIsNew", startIsNew)
+.add("nowInSec", nowInSec)
+.add("viewClusteringTtl", viewClusteringTtl)
+.add("viewClusteringTimestamp", viewClusteringTimestamp)
+.add("viewClusteringLocalDeletionTime", 
viewClusteringLocalDeletionTime)
+.add("columnValues", columnValues)
+.toString();
+}
+
+@Override
 public boolean equals(Object o)
 {
 if (this == o) return true;
@@ -459,6 +485,11 @@ public class TemporalRow
 return builder;
 }
 
+public Clustering baseClustering()
+{
+return startRow.clustering();
+}
+
 static class Set implements Iterable
 {
 private final ColumnFamilyStore baseCfs;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/src/java/org/apache/cassandra/db/view/View.java
--
diff --git a/src/java/org/apache/cassandra/db/view/View.java 
b/src/java/org/apache/cassandra/db/view/View.java
index 9d5f472..9388288 100644
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@ -85,7 +85,7 @@ public class View
 
 private Columns columns;
 
-private final boolean viewHasAllPrimaryKeys;
+private final boolean viewPKIncludesOnlyBasePKColumns;
 private final boolean includeAllColumns;
 private ViewBuilder builder;
 
@@ -104,7 +104,7 @@ public class View
 name = 

[jira] [Commented] (CASSANDRA-10401) Improve json2sstable error reporting on nonexistent column

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-10401:
-

Basically the constants are not present on 2.1, that's why I only used them on 
the 2.2 branch.

> Improve json2sstable error reporting on nonexistent column
> --
>
> Key: CASSANDRA-10401
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10401
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra 2.1.8.621
>Reporter: Jose Martinez Poblete
>Assignee: Paulo Motta
>
> We have the following table...
> {noformat}
> CREATE TABLE keyspace_name.table_name (
> col1 text,
> col2 text,
> col3 text,
> col4 text,
> PRIMARY KEY ((col1, col2), col3)
> ) WITH CLUSTERING ORDER BY (col3 ASC)
> {noformat}
> And the following  json in a file created from sstable2json tool
> {noformat}
> [
> {"key": "This is col1:This is col2,
>  "cells": [["This is col3:","",1443217787319002],
>["This is col3:"col4","This is col4",1443217787319002]]}
> ]
> {noformat}
> Let's say we deleted that record form the DB and wanted to bring it back
> If we try to create an sstable from this data in a json file named 
> test_file.json, we get a NPE 
> {noformat}
> -bash-4.1$ json2sstable -K elp -c table_name-3264cbe063c211e5bc34e746786b7b29 
> test_file.json  
> /var/lib/cassandra/data/keyspace_name/table_name-3264cbe063c211e5bc34e746786b7b29/keyspace_name-table_name-ka-1-Data.db
> Importing 1 keys...
> java.lang.NullPointerException
>   at 
> org.apache.cassandra.tools.SSTableImport.getKeyValidator(SSTableImport.java:442)
>   at 
> org.apache.cassandra.tools.SSTableImport.importUnsorted(SSTableImport.java:316)
>   at 
> org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:287)
>   at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:514)
> ERROR: null
> -bash-4.1$
> {noformat}



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

cassandra git commit: Improve json2sstable error reporting on nonexistent columns

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 2548365a6 -> ff9b6bb97


Improve json2sstable error reporting on nonexistent columns

patch by Paulo Motta; reviewed by Ariel Weisberg for CASSANDRA-10401


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

Branch: refs/heads/cassandra-2.1
Commit: ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5
Parents: 2548365
Author: Paulo Motta 
Authored: Mon Oct 5 15:04:09 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:19:13 2015 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/SSTableImport.java  | 5 +
 test/unit/org/apache/cassandra/tools/SSTableImportTest.java | 9 +
 3 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7771969..8ff726e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
  * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 87d52be..e0f3ef3 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -281,6 +281,11 @@ public class SSTableImport
  */
 public int importJson(String jsonFile, String keyspace, String cf, String 
ssTablePath) throws IOException
 {
+if (Schema.instance.getCFMetaData(keyspace, cf) == null)
+throw new IllegalArgumentException(String.format("Unknown 
keyspace/table %s.%s",
+ keyspace,
+ cf));
+
 ColumnFamily columnFamily = 
ArrayBackedSortedColumns.factory.create(keyspace, cf);
 IPartitioner partitioner = DatabaseDescriptor.getPartitioner();
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index a5f05f8..77036e8 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -51,6 +51,15 @@ import org.apache.cassandra.io.sstable.SSTableReader;
 
 public class SSTableImportTest extends SchemaLoader
 {
+@Test(expected = IllegalArgumentException.class)
+public void testImportUnknownCf() throws IOException, URISyntaxException
+{
+// Import JSON to temp SSTable file
+String jsonUrl = resourcePath("SimpleCF.json");
+File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+}
+
 @Test
 public void testImportSimpleCf() throws IOException, URISyntaxException
 {

[1/2] cassandra git commit: Improve json2sstable error reporting on nonexistent columns

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 f8783b7bb -> 59a32211a


Improve json2sstable error reporting on nonexistent columns

patch by Paulo Motta; reviewed by Ariel Weisberg for CASSANDRA-10401


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

Branch: refs/heads/cassandra-2.2
Commit: ff9b6bb973db7f6ebe650d909d24dcf5aebcfae5
Parents: 2548365
Author: Paulo Motta 
Authored: Mon Oct 5 15:04:09 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:19:13 2015 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/SSTableImport.java  | 5 +
 test/unit/org/apache/cassandra/tools/SSTableImportTest.java | 9 +
 3 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7771969..8ff726e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
  * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 87d52be..e0f3ef3 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -281,6 +281,11 @@ public class SSTableImport
  */
 public int importJson(String jsonFile, String keyspace, String cf, String 
ssTablePath) throws IOException
 {
+if (Schema.instance.getCFMetaData(keyspace, cf) == null)
+throw new IllegalArgumentException(String.format("Unknown 
keyspace/table %s.%s",
+ keyspace,
+ cf));
+
 ColumnFamily columnFamily = 
ArrayBackedSortedColumns.factory.create(keyspace, cf);
 IPartitioner partitioner = DatabaseDescriptor.getPartitioner();
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff9b6bb9/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index a5f05f8..77036e8 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -51,6 +51,15 @@ import org.apache.cassandra.io.sstable.SSTableReader;
 
 public class SSTableImportTest extends SchemaLoader
 {
+@Test(expected = IllegalArgumentException.class)
+public void testImportUnknownCf() throws IOException, URISyntaxException
+{
+// Import JSON to temp SSTable file
+String jsonUrl = resourcePath("SimpleCF.json");
+File tempSS = tempSSTableFile("Keyspace1", "Standard1");
+new SSTableImport(true).importJson(jsonUrl, "UnknownKeyspace", 
"UnknownCF", tempSS.getPath());
+}
+
 @Test
 public void testImportSimpleCf() throws IOException, URISyntaxException
 {

[jira] [Created] (CASSANDRA-10670) Stress tool isn't working with tables not having non-primary keys

[Arunsandu (JIRA)]

Arunsandu created CASSANDRA-10670:
-

 Summary: Stress tool isn't working with tables not having 
non-primary keys
 Key: CASSANDRA-10670
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10670
 Project: Cassandra
  Issue Type: Bug
  Components: Testing, Tools
Reporter: Arunsandu
 Fix For: 2.2.2, 2.1.8
 Attachments: Error.jpg, request_trace.yaml

Hi,
I am trying to pass request_trace.yaml as an input to the stress-tool as below:
./cassandra-stress user profile=request_trace.yaml n=100 
ops(likelyquery0=1,likelyquery1=2,insert=1) -node 10.32.100.16
the script is perfectly working fine for the other tables. But I get the below 
error for request_trace table. Please check the request_trace.yaml file for the 
script. 
This stress tool command throws error only when the table has single partition 
key as described above. In all the other cases where the table has non primary 
keys, am able to run the command and get the results.
 ```
- 
request_trace.yaml-
DML ### THIS IS UNDER CONSTRUCTION!!!
Keyspace Name

keyspace: autogeneratedtest
The CQL for creating a keyspace (optional if it already exists)

keyspace_definition: |
CREATE KEYSPACE autogeneratedtest WITH replication = {'class': 
'SimpleStrategy', 'replication_factor': 1};
Table name

table: request_trace
The CQL for creating a table you wish to stress (optional if it already exists)

table_definition:
CREATE TABLE request_trace (
service_context_id text,
trace_statement text,
PRIMARY KEY (service_context_id, trace_statement)
)
Column Distribution Specifications

columnspec:

name: service_context_id
size: gaussian(10..20)
population: gaussian(300..500)

name: trace_statement
size: gaussian(5..15)
population: gaussian(800..1000)

Batch Ratio Distribution Specifications

insert:
partitions: fixed(1) # Our partition key is the domain so only insert one per 
batch

select: fixed(1)/1000 # We have 1000 posts per domain so 1/1000 will allow 1 
post per batch

batchtype: UNLOGGED # Unlogged batches
A list of queries you wish to run against the schema

#
queries:
likelyquery0:
cql: SELECT * FROM request_trace WHERE service_context_id = ?
fields: samerow
likelyquery1:
cql: SELECT * FROM request_trace WHERE service_context_id = ? AND 
trace_statement = ?
fields: samerow
 ```
 ```
ERROR:
Warming up likelyquery0 with 5 iterations...
Warming up likelyquery1 with 5 iterations...
Warming up insert with 5 iterations...
Generating batches with [1..1] partitions and [0..0] rows (of [1..1] total rows 
in the partitions)
Exception in thread "main" com.datastax.driver.core.exceptions.SyntaxError: 
line 1:28 no viable alternative at input 'WHERE' (UPDATE "request_trace" SET  
[WHERE]...)
at com.datastax.driver.core.exceptions.SyntaxError.copy(SyntaxError.java:35)
at 
com.datastax.driver.core.DefaultResultSetFuture.extractCauseFromExecutionException(DefaultResultSetFuture.java:271)
at com.datastax.driver.core.AbstractSession.prepare(AbstractSession.java:82)
at 
org.apache.cassandra.stress.util.JavaDriverClient.prepare(JavaDriverClient.java:84)
at 
org.apache.cassandra.stress.StressProfile.getInsert(StressProfile.java:396)
at 
org.apache.cassandra.stress.settings.SettingsCommandUser$1.get(SettingsCommandUser.java:82)
at 
org.apache.cassandra.stress.settings.SettingsCommandUser$1.get(SettingsCommandUser.java:78)
at 
org.apache.cassandra.stress.operations.SampledOpDistributionFactory$1.get(SampledOpDistributionFactory.java:80)
at 
org.apache.cassandra.stress.StressAction$Consumer.(StressAction.java:269)
at org.apache.cassandra.stress.StressAction.run(StressAction.java:204)
at org.apache.cassandra.stress.StressAction.warmup(StressAction.java:105)
at org.apache.cassandra.stress.StressAction.run(StressAction.java:61)
at org.apache.cassandra.stress.Stress.main(Stress.java:114)
Caused by: com.datastax.driver.core.exceptions.SyntaxError: line 1:28 no viable 
alternative at input 'WHERE' (UPDATE "request_trace" SET  [WHERE]...)
at com.datastax.driver.core.Responses$Error.asException(Responses.java:123)
at com.datastax.driver.core.SessionManager$1.apply(SessionManager.java:167)
at com.datastax.driver.core.SessionManager$1.apply(SessionManager.java:142)
at com.google.common.util.concurrent.Futures$1.apply(Futures.java:713)
at 
com.google.common.util.concurrent.Futures$ChainingListenableFuture.run(Futures.java:861)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
 ```




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

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

[jake]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: be01d8eb8f5fe5c37cab314938c49edb9f435926
Parents: 735bd65 2998bb3
Author: T Jake Luciani 
Authored: Fri Nov 6 14:33:29 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:33:29 2015 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/view/TemporalRow.java   | 31 +++
 src/java/org/apache/cassandra/db/view/View.java | 24 ---
 .../cassandra/cql3/ViewFilteringTest.java   | 14 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 42 
 5 files changed, 108 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/CHANGES.txt
--
diff --cc CHANGES.txt
index dc82bd4,3662e6e..88d3fd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix AssertionError while flushing memtable due to materialized views
+incorrectly inserting empty rows (CASSANDRA-10614)
   * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
   * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
   * Fix distinct queries in mixed version cluster (CASSANDRA-10573)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/src/java/org/apache/cassandra/db/view/View.java
--

[1/2] cassandra git commit: Fix AssertionError while flushing memtable due to materialized views incorrectly inserting empty rows

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 735bd65d2 -> be01d8eb8


Fix AssertionError while flushing memtable due to materialized views 
incorrectly inserting empty rows

Patch by thobbs; reviewed by tjake for CASSANDRA-10614


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

Branch: refs/heads/trunk
Commit: 2998bb3cc45cf5e7225d0cb1ee7cfbd13e3edb57
Parents: 7fd2eaa
Author: Tyler Hobbs 
Authored: Wed Oct 28 14:33:10 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:32:51 2015 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/view/TemporalRow.java   | 31 +++
 src/java/org/apache/cassandra/db/view/View.java | 24 ---
 .../cassandra/cql3/ViewFilteringTest.java   | 14 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 42 
 5 files changed, 108 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 53e1e4a..3662e6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.0
+ * Fix AssertionError while flushing memtable due to materialized views
+   incorrectly inserting empty rows (CASSANDRA-10614)
  * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
  * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
  * Fix distinct queries in mixed version cluster (CASSANDRA-10573)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/src/java/org/apache/cassandra/db/view/TemporalRow.java
--
diff --git a/src/java/org/apache/cassandra/db/view/TemporalRow.java 
b/src/java/org/apache/cassandra/db/view/TemporalRow.java
index d876b00..01da6e7 100644
--- a/src/java/org/apache/cassandra/db/view/TemporalRow.java
+++ b/src/java/org/apache/cassandra/db/view/TemporalRow.java
@@ -243,6 +243,16 @@ public class TemporalRow
 row.addColumnValue(column, path, newCell.timestamp, 
newCell.ttl,
newCell.localDeletionTime, 
newCell.value, newCell.isNew);
 }
+
+@Override
+public String toString()
+{
+return MoreObjects.toStringHelper(this)
+.add("numSet", numSet)
+.add("existingCell", existingCell)
+.add("newCell", newCell)
+.toString();
+}
 }
 }
 
@@ -286,6 +296,22 @@ public class TemporalRow
 }
 
 @Override
+public String toString()
+{
+return MoreObjects.toStringHelper(this)
+.add("table", baseCfs.keyspace.getName() + "." + 
baseCfs.getTableName())
+.add("basePartitionKey", 
ByteBufferUtil.bytesToHex(basePartitionKey))
+.add("startRow", startRow.toString(baseCfs.metadata))
+.add("startIsNew", startIsNew)
+.add("nowInSec", nowInSec)
+.add("viewClusteringTtl", viewClusteringTtl)
+.add("viewClusteringTimestamp", viewClusteringTimestamp)
+.add("viewClusteringLocalDeletionTime", 
viewClusteringLocalDeletionTime)
+.add("columnValues", columnValues)
+.toString();
+}
+
+@Override
 public boolean equals(Object o)
 {
 if (this == o) return true;
@@ -459,6 +485,11 @@ public class TemporalRow
 return builder;
 }
 
+public Clustering baseClustering()
+{
+return startRow.clustering();
+}
+
 static class Set implements Iterable
 {
 private final ColumnFamilyStore baseCfs;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2998bb3c/src/java/org/apache/cassandra/db/view/View.java
--
diff --git a/src/java/org/apache/cassandra/db/view/View.java 
b/src/java/org/apache/cassandra/db/view/View.java
index 9d5f472..9388288 100644
--- a/src/java/org/apache/cassandra/db/view/View.java
+++ b/src/java/org/apache/cassandra/db/view/View.java
@@ -85,7 +85,7 @@ public class View
 
 private Columns columns;
 
-private final boolean viewHasAllPrimaryKeys;
+private final boolean viewPKIncludesOnlyBasePKColumns;
 private final boolean includeAllColumns;
 private ViewBuilder builder;
 
@@ -104,7 +104,7 @@ public class View
 name = definition.viewName;
 

[1/2] cassandra git commit: 3.0 release versions

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/trunk be01d8eb8 -> 12b8c696b


3.0 release versions


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

Branch: refs/heads/trunk
Commit: 96f407bce56b98cd824d18e32ee012dbb99a0286
Parents: 2998bb3
Author: T Jake Luciani 
Authored: Fri Nov 6 14:38:34 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:38:34 2015 -0500

--
 build.xml| 2 +-
 debian/changelog | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96f407bc/build.xml
--
diff --git a/build.xml b/build.xml
index 261d0e6..577506e 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/96f407bc/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 2d858fe..706714a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.0) unstable; urgency=medium
+
+  * New release 
+
+ -- Jake Luciani   Fri, 06 Nov 2015 14:37:07 -0500
+
 cassandra (3.0.0~rc2) unstable; urgency=medium
 
   * New release candidate 

cassandra git commit: 3.0 release versions

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 2998bb3cc -> 96f407bce


3.0 release versions


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

Branch: refs/heads/cassandra-3.0
Commit: 96f407bce56b98cd824d18e32ee012dbb99a0286
Parents: 2998bb3
Author: T Jake Luciani 
Authored: Fri Nov 6 14:38:34 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:38:34 2015 -0500

--
 build.xml| 2 +-
 debian/changelog | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96f407bc/build.xml
--
diff --git a/build.xml b/build.xml
index 261d0e6..577506e 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/96f407bc/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 2d858fe..706714a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.0) unstable; urgency=medium
+
+  * New release 
+
+ -- Jake Luciani   Fri, 06 Nov 2015 14:37:07 -0500
+
 cassandra (3.0.0~rc2) unstable; urgency=medium
 
   * New release candidate 

[jira] [Updated] (CASSANDRA-10638) logged_batch_compatibility tests fail on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10638:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> logged_batch_compatibility tests fail on Windows
> 
>
> Key: CASSANDRA-10638
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10638
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Paulo Motta
> Fix For: 3.1
>
>
> A number of the batch tests fail on Windows with a couple different errors. 
> On one build, they all fail with a pair of errors, e.g.:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/101/testReport/batch_test/TestBatch/logged_batch_compatibility_2_test_2/
> and
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/101/testReport/batch_test/TestBatch/logged_batch_compatibility_2_test/
> I can't tell if this is a C* failure or an environment issue, where the node 
> fails to start after being upgraded.
> On other runs, the tests flap when the test fails to delete temporary files. 
> Consider the failures here:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/batch_test/
> It could be an environmental issue, but I think I'd expect to see this error 
> in in other tests, but I haven't yet.



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

[jira] [Updated] (CASSANDRA-10642) cqlsh COPY bulk round trip dtest flaps on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10642:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> cqlsh COPY bulk round trip dtest flaps on Windows
> -
>
> Key: CASSANDRA-10642
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10642
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
> Fix For: 3.1
>
>
> {{cqlsh_tests/cqlsh_copy_tests.py:CqlshCopyTest.test_bulk_round_trip}} flaps 
> on Windows under both C* 3.0 and 2.2:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip/history/
> http://cassci.datastax.com/view/win32/job/cassandra-2.2_dtest_win32/127/testReport/junit/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip/
> It fails because, after round-tripping with cqlsh COPY, it fails to find as 
> many values as expected with {{SELECT COUNT (\*)}}. The stderr from cqlsh 
> includes the following error:
> {code}
> (EE)  (EE)  :2:(EE)   out waiting for replica nodes' responses] message="Operation timed out - 
> received only 0 responses.">(EE)  :2:Aborting import at record #190. 
> Previously inserted records are still present, and some records after that 
> may be present as well.(EE)  :2:(EE)   [Unavailable exception] message="Cannot achieve consistency level ONE">(EE)  
> :2:Aborting import at record #637. Previously inserted records are 
> still present, and some records after that may be present as well.(EE)  
> {code}
> So, it looks like the load step may be timing out. See this run for the error:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip/



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

[jira] [Updated] (CASSANDRA-10639) Commitlog compression test fails on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10639:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> Commitlog compression test fails on Windows
> ---
>
> Key: CASSANDRA-10639
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10639
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joshua McKenzie
> Fix For: 3.1
>
>
> {{commitlog_test.py:TestCommitLog.test_compression_error}} fails on Windows 
> under CassCI. It fails in a number of different ways. Here, it looks like 
> reading the CRC fails:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/commitlog_test/TestCommitLog/test_compression_error/
> Here, I believe it fails when trying to validate the CRC header:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/99/testReport/commitlog_test/TestCommitLog/test_compression_error/
> https://github.com/riptano/cassandra-dtest/blob/master/commitlog_test.py#L497
> Here's another failure where the header has a {{Q}} written in it instead of 
> a closing brace:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/91/testReport/junit/commitlog_test/TestCommitLog/test_compression_error/
> https://github.com/riptano/cassandra-dtest/blob/master/commitlog_test.py#L513
> [~bdeggleston] Do I remember correctly that you wrote this test? Can you take 
> this on?



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

[jira] [Updated] (CASSANDRA-10641) simultaneous_bootstrap_test fails on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10641:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> simultaneous_bootstrap_test fails on Windows
> 
>
> Key: CASSANDRA-10641
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10641
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joshua McKenzie
> Fix For: 2.2.x, 3.0.0
>
> Attachments: 10641.txt
>
>
> {{bootstrap_test.py:TestBootstrap.simultaneous_bootstrap_test}} fails on 
> Windows on C* 3.0 and 2.2:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/99/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> http://cassci.datastax.com/view/win32/job/cassandra-2.2_dtest_win32/127/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> It expects there to be a warning in the stderr of the node attempting to 
> start while another node boostraps, but the stderr is empty. It fails on this 
> line:
> https://github.com/riptano/cassandra-dtest/blob/master/bootstrap_test.py#L469
> [~yukim] I believe you're the person to handle this ticket? I'll assign you, 
> but feel free to reassign.



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

[jira] [Updated] (CASSANDRA-10647) manual 2i rebuilding dtest failure on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10647:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> manual 2i rebuilding dtest failure on Windows
> -
>
> Key: CASSANDRA-10647
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10647
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
> Fix For: 3.1
>
>
> {{secondary_indexes_test.py:TestSecondaryIndexes.test_manual_rebuild_index}} 
> failed once on CassCI running C* 3.0 under Windows:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/101/testReport/secondary_indexes_test/TestSecondaryIndexes/test_manual_rebuild_index/history/
> It fails here:
> https://github.com/riptano/cassandra-dtest/blob/master/secondary_indexes_test.py#L294
> with the error {{1 != 0}}. [~beobal] IIRC you understand these tests. Any 
> idea why it'd flap like this? or could this be a genuine regression?



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

[jira] [Updated] (CASSANDRA-10646) crash_during_decommission_test dtest fails on windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10646:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> crash_during_decommission_test dtest fails on windows
> -
>
> Key: CASSANDRA-10646
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10646
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
> Fix For: 3.1
>
>
> {{topology_test.py:TestTopology.crash_during_decommission_test}} flaps on on 
> C* 3.0 on Windows:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/topology_test/TestTopology/crash_during_decommission_test/history/
> Since this test raises 2 errors on failure, there are 2 histories on CassCI 
> for it:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/topology_test/TestTopology/crash_during_decommission_test_2/history/
> It looks like it fails because of contention over the temporary file where 
> {{cassandra.env}} is stored:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/101/testReport/junit/topology_test/TestTopology/crash_during_decommission_test/
> Looks like this happens when {{nodetool status}} is called, since 
> {{nodetool}} sources {{cassandra-env.sh}}.



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

[jira] [Updated] (CASSANDRA-10645) sstableverify_test dtest fails on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10645:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> sstableverify_test dtest fails on Windows
> -
>
> Key: CASSANDRA-10645
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10645
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joel Knighton
> Fix For: 3.1
>
>
> {{offline_tools_test.py:TestOfflineTools.sstableverify_test}} fails on CassCI 
> on C* 3.0 on Windows
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/history/
> It fails consistently, but not always after checking the same number of 
> sstables. For instance:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/
> vs.
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/93/testReport/junit/offline_tools_test/TestOfflineTools/sstableverify_test/
> I'm not sure if that's significant, but just in case, I thought it was worth 
> noting.
> Doesn't look like anyone's worked on this test particularly recently; 
> [~JoshuaMcKenzie], can you please find an assignee for this?



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

[jira] [Updated] (CASSANDRA-10644) multiple repair dtest fails under Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10644:
-
Parent Issue: CASSANDRA-10664  (was: CASSANDRA-10166)

> multiple repair dtest fails under Windows
> -
>
> Key: CASSANDRA-10644
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10644
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
> Fix For: 2.2.x, 3.1
>
>
> {{incremental_repair_test.py:TestIncRepair.multiple_repair_test}} flaps on 
> CassCI Windows runs on C* 3.0:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/incremental_repair_test/TestIncRepair/multiple_repair_test/history/
> The error is {{An existing connection was forcibly closed by the remote 
> host}}, and happens consistently in the failing runs:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/junit/incremental_repair_test/TestIncRepair/multiple_repair_test/
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/72/testReport/junit/incremental_repair_test/TestIncRepair/multiple_repair_test/
> [~yukim] Can you have a look? I feel like you're more likely than anyone else 
> to understand the streaming error. In particular: is this what happens when a 
> node goes down? This could be an environment error, rather than a C* bug.



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

[jira] [Updated] (CASSANDRA-10664) Fix failing tests for 3.1

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10664:
-
Description: This is basCASSANDRA-10166

> Fix failing tests for 3.1
> -
>
> Key: CASSANDRA-10664
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10664
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sylvain Lebresne
>
> This is basCASSANDRA-10166



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

[jira] [Resolved] (CASSANDRA-10166) Fix failing tests

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne resolved CASSANDRA-10166.
--
   Resolution: Fixed
Fix Version/s: (was: 3.1)
   3.0.0

The goal of that meta ticket was to group sub-tickets to make it easier to 
figure out if we had a ticket open for a given failing test, but the number of 
subtasks on this makes this a bit harder now. So since we're gonna release 3.0, 
I've move all remaining tickets to the new meta-issue CASSANDRA-10664 and I'm 
closing this one.

> Fix failing tests
> -
>
> Key: CASSANDRA-10166
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10166
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sylvain Lebresne
>Assignee: Sylvain Lebresne
> Fix For: 3.0.0
>
>
> Until we find a better way to track those things, this is meant as a master 
> ticket to track tickets open regarding tests (unit test and dtests, though at 
> the time of this writing only dtest are still failing) that are still 
> failing. 



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

[jira] [Updated] (CASSANDRA-10664) Fix failing tests for 3.1

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10664:
-
Description: This is the continuation of CASSANDRA-10166, just a 
meta-ticket to group all tickets related to fixing any unit test or dtest.  
(was: This is basCASSANDRA-10166)

> Fix failing tests for 3.1
> -
>
> Key: CASSANDRA-10664
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10664
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sylvain Lebresne
>
> This is the continuation of CASSANDRA-10166, just a meta-ticket to group all 
> tickets related to fixing any unit test or dtest.



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

[jira] [Commented] (CASSANDRA-10607) Using reserved keyword for Type field crashes cqlsh

[Adam Holmberg (JIRA)]

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

Adam Holmberg commented on CASSANDRA-10607:
---

bq. does that error message ring a bell?
Yes. This stems from the way the driver previously represented UDTs using 
namedtuple. This type has restrictions on what field names can be. 

This should be resolved in [the 
changes|https://github.com/datastax/python-driver/pull/413] entered for 
[PYTHON-413|https://datastax-oss.atlassian.net/browse/PYTHON-413].

I'm linking a couple of related Cassandra tickets as well.

> Using reserved keyword for Type field crashes cqlsh
> ---
>
> Key: CASSANDRA-10607
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10607
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Mac OS X El Capitan, Java 1.8.0_25-b17, fresh install of 
> apache-cassandra-2.2.1-bin.tar.gz
>Reporter: Mike Prince
>Priority: Minor
> Fix For: 2.2.x
>
> Attachments: create.cql
>
>
> 1) From a fresh cassandra node start, start cqlsh and execute:
> {code}
> CREATE KEYSPACE foospace
> WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
> USE foospace;
> CREATE TYPE Foo(
>   "from" text
> );
> CREATE TABLE Bar(
>   id text PRIMARY KEY,
>   foo frozen
> );
> {code}
> 2) {{select * from bar;}}
> {code}
> Traceback (most recent call last):
>   File "bin/cqlsh.py", line 1166, in perform_simple_statement
> rows = future.result(self.session.default_timeout)
>   File 
> "/Users/mike/mobido/servers/apache-cassandra-2.2.1/bin/../lib/cassandra-driver-internal-only-2.6.0c2.post.zip/cassandra-driver-2.6.0c2.post/cassandra/cluster.py",
>  line 3296, in result
> raise self._final_exception
> ValueError: Type names and field names cannot be a keyword: 'from'
> {code}
> 3) Exit cqlsh and try to run cqlsh again, this error occurs:
> {code}
> Connection error: ('Unable to connect to any servers', {'127.0.0.1': 
> ValueError("Don't know how to parse type string 
> u'org.apache.cassandra.db.marshal.UserType(foospace,666f6f,66726f6d:org.apache.cassandra.db.marshal.UTF8Type)':
>  Type names and field names cannot be a keyword: 'from'",)})
> {code}



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

[jira] [Updated] (CASSANDRA-10664) Fix failing tests for 3.1

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10664:
-
Fix Version/s: 3.1

> Fix failing tests for 3.1
> -
>
> Key: CASSANDRA-10664
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10664
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sylvain Lebresne
> Fix For: 3.1
>
>
> This is the continuation of CASSANDRA-10166, just a meta-ticket to group all 
> tickets related to fixing any unit test or dtest.



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

[jira] [Created] (CASSANDRA-10665) Many tests in concurrent_schema_changes_test are failing

[Sylvain Lebresne (JIRA)]

Sylvain Lebresne created CASSANDRA-10665:


 Summary: Many tests in concurrent_schema_changes_test are failing
 Key: CASSANDRA-10665
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10665
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Sylvain Lebresne
 Fix For: 3.1


On the [last build at the time of this 
writing|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/], we have the 
following failures:
* {{create_lots_of_alters_concurrently_test}}
* {{create_lots_of_schema_churn_with_node_down_test}}
* {{create_lots_of_schema_churn_test}}
but I seem to remember that other of those {{concurrent_schema_changes_test}} 
are sometimes failing.



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

[jira] [Created] (CASSANDRA-10666) jmx_test.TestJMX.test_compactionstats is flapping

[Sylvain Lebresne (JIRA)]

Sylvain Lebresne created CASSANDRA-10666:


 Summary: jmx_test.TestJMX.test_compactionstats is flapping
 Key: CASSANDRA-10666
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10666
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Sylvain Lebresne
Assignee: Jim Witschey
 Fix For: 3.1


See the [history for that 
test|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/jmx_test/TestJMX/test_compactionstats/history/].
 On each failure there is something about a problem with {{jolokia}} so that's 
probably a test environment problem. Still needs to be fixed.



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

[jira] [Commented] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10476:
--

[~blerer] so, going forward, we don't expect the 2.2.3 -> 3.X upgrade path to 
succeed? If that's the case we should make sure that's documented somewhere.

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging
> {code}



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

[jira] [Created] (CASSANDRA-10667) compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test is flapping

[Sylvain Lebresne (JIRA)]

Sylvain Lebresne created CASSANDRA-10667:


 Summary: 
compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test
 is flapping
 Key: CASSANDRA-10667
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10667
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Sylvain Lebresne
Assignee: Marcus Eriksson


See [the history of that 
test|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/jmx_test/TestJMX/test_compactionstats/history/].
 From the error, it sounds like the test may have some overly optimistic of 
what to expect but I haven't looked closer.



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

[jira] [Commented] (CASSANDRA-7645) cqlsh: show partial trace if incomplete after max_trace_wait

[Adam Holmberg (JIRA)]

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

Adam Holmberg commented on CASSANDRA-7645:
--

bq. if we get a TraceUnavailable ... after some traces were already printed.
That won't happen because all traces are fetched before returning (i.e., this 
is not a generator). It will raise if any of the fetches fail:
https://github.com/datastax/python-driver/blob/4ea3c72d809e92d2b554415b9f35945fbd573d18/cassandra/cluster.py#L3116-L3131

If you want to make it explicit we could form a list and run though that, but 
it's not necessary the way it's written:
{code}
traces = list(future.get_all_query_traces(...))
for trace in traces:
...
{code}

> cqlsh: show partial trace if incomplete after max_trace_wait
> 
>
> Key: CASSANDRA-7645
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7645
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
>Reporter: Tyler Hobbs
>Assignee: Carl Yeksigian
>Priority: Trivial
> Fix For: 2.2.4, 2.1.12, 3.0.0
>
>
> If a trace hasn't completed within {{max_trace_wait}}, cqlsh will say the 
> trace is unavailable and not show anything.  It (and the underlying python 
> driver) determines when the trace is complete by checking if the {{duration}} 
> column in {{system_traces.sessions}} is non-null.  If {{duration}} is null 
> but we still have some trace events when the timeout is hit, cqlsh should 
> print whatever trace events we have along with a warning about it being 
> incomplete.



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

[jira] [Commented] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10476:
--

bq. we don't expect the 2.2.3 -> 3.X upgrade path to succeed?

We *do* expect 2.2.3 -> 3.0 upgrade to succeed. We don't expect 
{{static_columns_paging_test}} to pass however since that test don't even pass 
for non-upgrade test on 2.2.3, it's a bug of 2.2.3 that has been fixed in 2.2.4 
(CASSANDRA-10381). If we can make so that the test doesn't run on 2.2.3 (but 
does run once we'll update to 2.2.4), that would be perfect.

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging
> {code}



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

[jira] [Updated] (CASSANDRA-10665) Many tests in concurrent_schema_changes_test are failing

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10665:
-
Assignee: Sam Tunnicliffe

> Many tests in concurrent_schema_changes_test are failing
> 
>
> Key: CASSANDRA-10665
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10665
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Sylvain Lebresne
>Assignee: Sam Tunnicliffe
> Fix For: 3.1
>
>
> On the [last build at the time of this 
> writing|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/], we have the 
> following failures:
> * {{create_lots_of_alters_concurrently_test}}
> * {{create_lots_of_schema_churn_with_node_down_test}}
> * {{create_lots_of_schema_churn_test}}
> but I seem to remember that other of those {{concurrent_schema_changes_test}} 
> are sometimes failing.



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

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

[Sylvain Lebresne (JIRA)]

Sylvain Lebresne created CASSANDRA-10668:


 Summary: bootstrap_test.TestBootstrap.resumable_bootstrap_test is 
failing
 Key: CASSANDRA-10668
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10668
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Sylvain Lebresne
Assignee: Yuki Morishita
 Fix For: 3.1


>From the [test 
>history|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/bootstrap_test/TestBootstrap/resumable_bootstrap_test/history/],
> it seems the test has been flappy for a while, but it's been constantly 
>failing for the last few builts.



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

[jira] [Commented] (CASSANDRA-10632) sstableutil tests failing on Windows

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10632:
--

Fyi, those are not only failing on windows, they appear 
[here|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/#showFailuresLink] 
too. So that's probably not a windows specific thing.

> sstableutil tests failing on Windows
> 
>
> Key: CASSANDRA-10632
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10632
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Jim Witschey
> Fix For: 3.1
>
>
> {{sstableutil_test.py:SSTableUtilTest.abortedcompaction_test}} and 
> {{sstableutil_test.py:SSTableUtilTest.compaction_test}} fail on Windows:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/abortedcompaction_test/
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/compaction_test/
> This is a pretty simple failure -- looks like the underlying behavior is ok, 
> but string comparison fails when the leading {{d}} in the filename is 
> lowercase as returned by {{sstableutil}} (see the [{{_invoke_sstableutil}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L128]),
>  but uppercase as returned by {{glob.glob}} (see the [{{_get_sstable_files}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L160]).
> Do I understand correctly that Windows filenames are case-insensitive, 
> including the drive portion? If that's the case, then we can just lowercase 
> the file names in the test helper functions above when the tests are run on 
> Windows. [~JoshuaMcKenzie] can you confirm? I'll fix this in the tests if so. 
> If I'm wrong, and something in {{sstableutil}} needs to be fixed, could you 
> find an assignee?



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

[jira] [Updated] (CASSANDRA-10632) sstableutil tests failing

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10632:
-
Summary: sstableutil tests failing  (was: sstableutil tests failing on 
Windows)

> sstableutil tests failing
> -
>
> Key: CASSANDRA-10632
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10632
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Jim Witschey
> Fix For: 3.1
>
>
> {{sstableutil_test.py:SSTableUtilTest.abortedcompaction_test}} and 
> {{sstableutil_test.py:SSTableUtilTest.compaction_test}} fail on Windows:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/abortedcompaction_test/
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/compaction_test/
> This is a pretty simple failure -- looks like the underlying behavior is ok, 
> but string comparison fails when the leading {{d}} in the filename is 
> lowercase as returned by {{sstableutil}} (see the [{{_invoke_sstableutil}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L128]),
>  but uppercase as returned by {{glob.glob}} (see the [{{_get_sstable_files}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L160]).
> Do I understand correctly that Windows filenames are case-insensitive, 
> including the drive portion? If that's the case, then we can just lowercase 
> the file names in the test helper functions above when the tests are run on 
> Windows. [~JoshuaMcKenzie] can you confirm? I'll fix this in the tests if so. 
> If I'm wrong, and something in {{sstableutil}} needs to be fixed, could you 
> find an assignee?



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

[jira] [Created] (CASSANDRA-10669) Scrub dtests are failing

[Sylvain Lebresne (JIRA)]

Sylvain Lebresne created CASSANDRA-10669:


 Summary: Scrub dtests are failing
 Key: CASSANDRA-10669
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10669
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Sylvain Lebresne
 Fix For: 3.1


A [bunch of scrub 
dtest|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/] have been 
failing for a while. Looking at the history of one of those test, it used to 
pass reliably but stopped working a while ago, and the changes when that 
happened doesn't seem related from a quick glance. So maybe that's due to a 
change in the dtest framework (maybe a ccm change even).



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

cassandra git commit: (cqlsh) fix COPY using wrong variable name for time_format

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 2ca759902 -> 81e520c54


(cqlsh) fix COPY using wrong variable name for time_format

patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633


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

Branch: refs/heads/cassandra-2.1
Commit: 81e520c54be8d397afaa0adf97178beccbf3
Parents: 2ca7599
Author: Stefania Alborghetti 
Authored: Tue Nov 3 09:10:22 2015 +0800
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:22:42 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a994ca1..14a7fbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index ca45be3..b56a423 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1507,7 +1507,7 @@ class Shell(cmd.Cmd):
   HEADER=false- whether to ignore the first line
   NULL='' - string that represents a null value
   ENCODING='utf8' - encoding for CSV output (COPY TO only)
-  TIME_FORMAT=- timestamp strftime format (COPY TO only)
+  TIMEFORMAT= - timestamp strftime format (COPY TO only)
 '%Y-%m-%d %H:%M:%S%z'   defaults to time_format value in cqlshrc
 
 When entering CSV data on STDIN, you can use the sequence "\."
@@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
 encoding = opts.pop('encoding', 'utf8')
 nullval = opts.pop('null', '')
 header = bool(opts.pop('header', '').lower() == 'true')
-timestamp_format = opts.pop('time_format', 
self.display_timestamp_format)
+time_format = opts.pop('timeformat', self.display_time_format)
 if dialect_options['quotechar'] == dialect_options['escapechar']:
 dialect_options['doublequote'] = True
 del dialect_options['escapechar']
@@ -1839,7 +1839,6 @@ class Shell(cmd.Cmd):
 
 meter = RateMeter(1)
 try:
-dtformats = DateTimeFormat(timestamp_format, 
self.display_date_format, self.display_nanotime_format)
 dump = self.prep_export_dump(ks, cf, columns)
 writer = csv.writer(csvdest, **dialect_options)
 if header:
@@ -1847,7 +1846,7 @@ class Shell(cmd.Cmd):
 for row in dump:
 fmt = lambda v: \
 format_value(v, output_encoding=encoding, nullval=nullval,
- time_format=dtformats,
+ time_format=time_format,
  
float_precision=self.display_float_precision).strval
 writer.writerow(map(fmt, row.values()))
 meter.increment()

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

[aleksey]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 17bddd3,000..a6070ef
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2737 -1,0 +1,2737 @@@
 +#!/bin/sh
 +# -*- mode: Python -*-
 +
 +# Licensed to the Apache Software Foundation (ASF) under one
 +# or more contributor license agreements.  See the NOTICE file
 +# distributed with this work for additional information
 +# regarding copyright ownership.  The ASF licenses this file
 +# to you under the Apache License, Version 2.0 (the
 +# "License"); you may not use this file except in compliance
 +# with the License.  You may obtain a copy of the License at
 +#
 +# http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
 +""":"
 +# bash code here; finds a suitable python interpreter and execs this file.
 +# prefer unqualified "python" if suitable:
 +python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 
0x0300))' 2>/dev/null \
 +&& exec python "$0" "$@"
 +for pyver in 2.6 2.7 2.5; do
 +which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
 +done
 +echo "No appropriate python interpreter found." >&2
 +exit 1
 +":"""
 +
 +from __future__ import with_statement
 +
 +import cmd
 +import codecs
 +import ConfigParser
 +import csv
 +import getpass
 +import locale
 +import multiprocessing
 +import optparse
 +import os
 +import platform
 +import sys
 +import time
 +import traceback
 +import warnings
 +from contextlib import contextmanager
 +from functools import partial
 +from glob import glob
 +from StringIO import StringIO
 +from uuid import UUID
 +
 +if sys.version_info[0] != 2 or sys.version_info[1] != 7:
 +sys.exit("\nCQL Shell supports only Python 2.7\n")
 +
 +description = "CQL Shell for Apache Cassandra"
 +version = "5.0.1"
 +
 +readline = None
 +try:
 +# check if tty first, cause readline doesn't check, and only cares
 +# about $TERM. we don't want the funky escape code stuff to be
 +# output if not a tty.
 +if sys.stdin.isatty():
 +import readline
 +except ImportError:
 +pass
 +
 +CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
 +
 +CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
 +
 +# use bundled libs for python-cql and thrift, if available. if there
 +# is a ../lib dir, use bundled libs there preferentially.
 +ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
 +myplatform = platform.system()
 +if myplatform == 'Linux':
 +ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
 +
 +if os.environ.get('CQLSH_NO_BUNDLED', ''):
 +ZIPLIB_DIRS = ()
 +
 +
 +def find_zip(libprefix):
 +for ziplibdir in ZIPLIB_DIRS:
 +zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
 +if zips:
 +return max(zips)   # probably the highest version, if multiple
 +
 +cql_zip = find_zip(CQL_LIB_PREFIX)
 +if cql_zip:
 +ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
 +sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
 +
 +third_parties = ('futures-', 'six-')
 +
 +for lib in third_parties:
 +lib_zip = find_zip(lib)
 +if lib_zip:
 +sys.path.insert(0, lib_zip)
 +
 +warnings.filterwarnings("ignore", r".*blist.*")
 +try:
 +import cassandra
 +except ImportError, e:
 +sys.exit("\nPython Cassandra driver not installed, or not on 
PYTHONPATH.\n"
 + 'You might try "pip install cassandra-driver".\n\n'
 + 'Python: %s\n'
 + 'Module load path: %r\n\n'
 + 'Error: %s\n' % (sys.executable, sys.path, e))
 +
 +from cassandra.auth import PlainTextAuthProvider
 +from cassandra.cluster import Cluster
 +from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 +TableMetadata, protect_name, protect_names,
 +protect_value)
 +from cassandra.policies import WhiteListRoundRobinPolicy
 +from cassandra.protocol import QueryMessage, ResultMessage
 +from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 +
 +# cqlsh should run correctly when run out of a Cassandra source tree,
 +# out of an unpacked Cassandra tarball, and after a proper package install.
 +cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
 +if os.path.isdir(cqlshlibdir):
 +sys.path.insert(0, cqlshlibdir)
 +
 +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
 +from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
 + RED, FormattedValue, 

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

[aleksey]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 17bddd3,000..a6070ef
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2737 -1,0 +1,2737 @@@
 +#!/bin/sh
 +# -*- mode: Python -*-
 +
 +# Licensed to the Apache Software Foundation (ASF) under one
 +# or more contributor license agreements.  See the NOTICE file
 +# distributed with this work for additional information
 +# regarding copyright ownership.  The ASF licenses this file
 +# to you under the Apache License, Version 2.0 (the
 +# "License"); you may not use this file except in compliance
 +# with the License.  You may obtain a copy of the License at
 +#
 +# http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
 +""":"
 +# bash code here; finds a suitable python interpreter and execs this file.
 +# prefer unqualified "python" if suitable:
 +python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 
0x0300))' 2>/dev/null \
 +&& exec python "$0" "$@"
 +for pyver in 2.6 2.7 2.5; do
 +which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
 +done
 +echo "No appropriate python interpreter found." >&2
 +exit 1
 +":"""
 +
 +from __future__ import with_statement
 +
 +import cmd
 +import codecs
 +import ConfigParser
 +import csv
 +import getpass
 +import locale
 +import multiprocessing
 +import optparse
 +import os
 +import platform
 +import sys
 +import time
 +import traceback
 +import warnings
 +from contextlib import contextmanager
 +from functools import partial
 +from glob import glob
 +from StringIO import StringIO
 +from uuid import UUID
 +
 +if sys.version_info[0] != 2 or sys.version_info[1] != 7:
 +sys.exit("\nCQL Shell supports only Python 2.7\n")
 +
 +description = "CQL Shell for Apache Cassandra"
 +version = "5.0.1"
 +
 +readline = None
 +try:
 +# check if tty first, cause readline doesn't check, and only cares
 +# about $TERM. we don't want the funky escape code stuff to be
 +# output if not a tty.
 +if sys.stdin.isatty():
 +import readline
 +except ImportError:
 +pass
 +
 +CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
 +
 +CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
 +
 +# use bundled libs for python-cql and thrift, if available. if there
 +# is a ../lib dir, use bundled libs there preferentially.
 +ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
 +myplatform = platform.system()
 +if myplatform == 'Linux':
 +ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
 +
 +if os.environ.get('CQLSH_NO_BUNDLED', ''):
 +ZIPLIB_DIRS = ()
 +
 +
 +def find_zip(libprefix):
 +for ziplibdir in ZIPLIB_DIRS:
 +zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
 +if zips:
 +return max(zips)   # probably the highest version, if multiple
 +
 +cql_zip = find_zip(CQL_LIB_PREFIX)
 +if cql_zip:
 +ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
 +sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
 +
 +third_parties = ('futures-', 'six-')
 +
 +for lib in third_parties:
 +lib_zip = find_zip(lib)
 +if lib_zip:
 +sys.path.insert(0, lib_zip)
 +
 +warnings.filterwarnings("ignore", r".*blist.*")
 +try:
 +import cassandra
 +except ImportError, e:
 +sys.exit("\nPython Cassandra driver not installed, or not on 
PYTHONPATH.\n"
 + 'You might try "pip install cassandra-driver".\n\n'
 + 'Python: %s\n'
 + 'Module load path: %r\n\n'
 + 'Error: %s\n' % (sys.executable, sys.path, e))
 +
 +from cassandra.auth import PlainTextAuthProvider
 +from cassandra.cluster import Cluster
 +from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 +TableMetadata, protect_name, protect_names,
 +protect_value)
 +from cassandra.policies import WhiteListRoundRobinPolicy
 +from cassandra.protocol import QueryMessage, ResultMessage
 +from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 +
 +# cqlsh should run correctly when run out of a Cassandra source tree,
 +# out of an unpacked Cassandra tarball, and after a proper package install.
 +cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
 +if os.path.isdir(cqlshlibdir):
 +sys.path.insert(0, cqlshlibdir)
 +
 +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
 +from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
 + RED, FormattedValue, 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: cfbe2d35b0402f8272ed562a99ff462283117d9a
Parents: 5343a75 edca4dc
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:26:14 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:26:14 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbe2d35/CHANGES.txt
--
diff --cc CHANGES.txt
index 146ee73,c33b8c9..c39f119
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,7 -3,11 +35,8 @@@ Merged from 2.2
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

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

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: edca4dcecca168f55781f099bc8932c226aa7daa
Parents: 6367987 81e520c
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:25:53 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:25:53 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e969a5,14a7fbd..c33b8c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

[1/3] cassandra git commit: (cqlsh) fix COPY using wrong variable name for time_format

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 6367987f4 -> edca4dcec


(cqlsh) fix COPY using wrong variable name for time_format

patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633


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

Branch: refs/heads/cassandra-2.2
Commit: 81e520c54be8d397afaa0adf97178beccbf3
Parents: 2ca7599
Author: Stefania Alborghetti 
Authored: Tue Nov 3 09:10:22 2015 +0800
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:22:42 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a994ca1..14a7fbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index ca45be3..b56a423 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1507,7 +1507,7 @@ class Shell(cmd.Cmd):
   HEADER=false- whether to ignore the first line
   NULL='' - string that represents a null value
   ENCODING='utf8' - encoding for CSV output (COPY TO only)
-  TIME_FORMAT=- timestamp strftime format (COPY TO only)
+  TIMEFORMAT= - timestamp strftime format (COPY TO only)
 '%Y-%m-%d %H:%M:%S%z'   defaults to time_format value in cqlshrc
 
 When entering CSV data on STDIN, you can use the sequence "\."
@@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
 encoding = opts.pop('encoding', 'utf8')
 nullval = opts.pop('null', '')
 header = bool(opts.pop('header', '').lower() == 'true')
-timestamp_format = opts.pop('time_format', 
self.display_timestamp_format)
+time_format = opts.pop('timeformat', self.display_time_format)
 if dialect_options['quotechar'] == dialect_options['escapechar']:
 dialect_options['doublequote'] = True
 del dialect_options['escapechar']
@@ -1839,7 +1839,6 @@ class Shell(cmd.Cmd):
 
 meter = RateMeter(1)
 try:
-dtformats = DateTimeFormat(timestamp_format, 
self.display_date_format, self.display_nanotime_format)
 dump = self.prep_export_dump(ks, cf, columns)
 writer = csv.writer(csvdest, **dialect_options)
 if header:
@@ -1847,7 +1846,7 @@ class Shell(cmd.Cmd):
 for row in dump:
 fmt = lambda v: \
 format_value(v, output_encoding=encoding, nullval=nullval,
- time_format=dtformats,
+ time_format=time_format,
  
float_precision=self.display_float_precision).strval
 writer.writerow(map(fmt, row.values()))
 meter.increment()

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: edca4dcecca168f55781f099bc8932c226aa7daa
Parents: 6367987 81e520c
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:25:53 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:25:53 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e969a5,14a7fbd..c33b8c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

[1/4] cassandra git commit: (cqlsh) fix COPY using wrong variable name for time_format

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 5343a75bf -> cfbe2d35b


(cqlsh) fix COPY using wrong variable name for time_format

patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633


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

Branch: refs/heads/cassandra-3.0
Commit: 81e520c54be8d397afaa0adf97178beccbf3
Parents: 2ca7599
Author: Stefania Alborghetti 
Authored: Tue Nov 3 09:10:22 2015 +0800
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:22:42 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a994ca1..14a7fbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index ca45be3..b56a423 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1507,7 +1507,7 @@ class Shell(cmd.Cmd):
   HEADER=false- whether to ignore the first line
   NULL='' - string that represents a null value
   ENCODING='utf8' - encoding for CSV output (COPY TO only)
-  TIME_FORMAT=- timestamp strftime format (COPY TO only)
+  TIMEFORMAT= - timestamp strftime format (COPY TO only)
 '%Y-%m-%d %H:%M:%S%z'   defaults to time_format value in cqlshrc
 
 When entering CSV data on STDIN, you can use the sequence "\."
@@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
 encoding = opts.pop('encoding', 'utf8')
 nullval = opts.pop('null', '')
 header = bool(opts.pop('header', '').lower() == 'true')
-timestamp_format = opts.pop('time_format', 
self.display_timestamp_format)
+time_format = opts.pop('timeformat', self.display_time_format)
 if dialect_options['quotechar'] == dialect_options['escapechar']:
 dialect_options['doublequote'] = True
 del dialect_options['escapechar']
@@ -1839,7 +1839,6 @@ class Shell(cmd.Cmd):
 
 meter = RateMeter(1)
 try:
-dtformats = DateTimeFormat(timestamp_format, 
self.display_date_format, self.display_nanotime_format)
 dump = self.prep_export_dump(ks, cf, columns)
 writer = csv.writer(csvdest, **dialect_options)
 if header:
@@ -1847,7 +1846,7 @@ class Shell(cmd.Cmd):
 for row in dump:
 fmt = lambda v: \
 format_value(v, output_encoding=encoding, nullval=nullval,
- time_format=dtformats,
+ time_format=time_format,
  
float_precision=self.display_float_precision).strval
 writer.writerow(map(fmt, row.values()))
 meter.increment()

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

[aleksey]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 17bddd3,000..a6070ef
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2737 -1,0 +1,2737 @@@
 +#!/bin/sh
 +# -*- mode: Python -*-
 +
 +# Licensed to the Apache Software Foundation (ASF) under one
 +# or more contributor license agreements.  See the NOTICE file
 +# distributed with this work for additional information
 +# regarding copyright ownership.  The ASF licenses this file
 +# to you under the Apache License, Version 2.0 (the
 +# "License"); you may not use this file except in compliance
 +# with the License.  You may obtain a copy of the License at
 +#
 +# http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
 +""":"
 +# bash code here; finds a suitable python interpreter and execs this file.
 +# prefer unqualified "python" if suitable:
 +python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 
0x0300))' 2>/dev/null \
 +&& exec python "$0" "$@"
 +for pyver in 2.6 2.7 2.5; do
 +which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
 +done
 +echo "No appropriate python interpreter found." >&2
 +exit 1
 +":"""
 +
 +from __future__ import with_statement
 +
 +import cmd
 +import codecs
 +import ConfigParser
 +import csv
 +import getpass
 +import locale
 +import multiprocessing
 +import optparse
 +import os
 +import platform
 +import sys
 +import time
 +import traceback
 +import warnings
 +from contextlib import contextmanager
 +from functools import partial
 +from glob import glob
 +from StringIO import StringIO
 +from uuid import UUID
 +
 +if sys.version_info[0] != 2 or sys.version_info[1] != 7:
 +sys.exit("\nCQL Shell supports only Python 2.7\n")
 +
 +description = "CQL Shell for Apache Cassandra"
 +version = "5.0.1"
 +
 +readline = None
 +try:
 +# check if tty first, cause readline doesn't check, and only cares
 +# about $TERM. we don't want the funky escape code stuff to be
 +# output if not a tty.
 +if sys.stdin.isatty():
 +import readline
 +except ImportError:
 +pass
 +
 +CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
 +
 +CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
 +
 +# use bundled libs for python-cql and thrift, if available. if there
 +# is a ../lib dir, use bundled libs there preferentially.
 +ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
 +myplatform = platform.system()
 +if myplatform == 'Linux':
 +ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
 +
 +if os.environ.get('CQLSH_NO_BUNDLED', ''):
 +ZIPLIB_DIRS = ()
 +
 +
 +def find_zip(libprefix):
 +for ziplibdir in ZIPLIB_DIRS:
 +zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
 +if zips:
 +return max(zips)   # probably the highest version, if multiple
 +
 +cql_zip = find_zip(CQL_LIB_PREFIX)
 +if cql_zip:
 +ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
 +sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
 +
 +third_parties = ('futures-', 'six-')
 +
 +for lib in third_parties:
 +lib_zip = find_zip(lib)
 +if lib_zip:
 +sys.path.insert(0, lib_zip)
 +
 +warnings.filterwarnings("ignore", r".*blist.*")
 +try:
 +import cassandra
 +except ImportError, e:
 +sys.exit("\nPython Cassandra driver not installed, or not on 
PYTHONPATH.\n"
 + 'You might try "pip install cassandra-driver".\n\n'
 + 'Python: %s\n'
 + 'Module load path: %r\n\n'
 + 'Error: %s\n' % (sys.executable, sys.path, e))
 +
 +from cassandra.auth import PlainTextAuthProvider
 +from cassandra.cluster import Cluster
 +from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 +TableMetadata, protect_name, protect_names,
 +protect_value)
 +from cassandra.policies import WhiteListRoundRobinPolicy
 +from cassandra.protocol import QueryMessage, ResultMessage
 +from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 +
 +# cqlsh should run correctly when run out of a Cassandra source tree,
 +# out of an unpacked Cassandra tarball, and after a proper package install.
 +cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
 +if os.path.isdir(cqlshlibdir):
 +sys.path.insert(0, cqlshlibdir)
 +
 +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
 +from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
 + RED, FormattedValue, 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: edca4dcecca168f55781f099bc8932c226aa7daa
Parents: 6367987 81e520c
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:25:53 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:25:53 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e969a5,14a7fbd..c33b8c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d91fb581eef2295efdab2b2dfc6233f092b0b54e
Parents: 9084428 cfbe2d3
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:26:44 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:26:44 2015 +

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


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

[1/5] cassandra git commit: (cqlsh) fix COPY using wrong variable name for time_format

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 908442878 -> d91fb581e


(cqlsh) fix COPY using wrong variable name for time_format

patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633


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

Branch: refs/heads/trunk
Commit: 81e520c54be8d397afaa0adf97178beccbf3
Parents: 2ca7599
Author: Stefania Alborghetti 
Authored: Tue Nov 3 09:10:22 2015 +0800
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:22:42 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a994ca1..14a7fbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e520c5/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index ca45be3..b56a423 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1507,7 +1507,7 @@ class Shell(cmd.Cmd):
   HEADER=false- whether to ignore the first line
   NULL='' - string that represents a null value
   ENCODING='utf8' - encoding for CSV output (COPY TO only)
-  TIME_FORMAT=- timestamp strftime format (COPY TO only)
+  TIMEFORMAT= - timestamp strftime format (COPY TO only)
 '%Y-%m-%d %H:%M:%S%z'   defaults to time_format value in cqlshrc
 
 When entering CSV data on STDIN, you can use the sequence "\."
@@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
 encoding = opts.pop('encoding', 'utf8')
 nullval = opts.pop('null', '')
 header = bool(opts.pop('header', '').lower() == 'true')
-timestamp_format = opts.pop('time_format', 
self.display_timestamp_format)
+time_format = opts.pop('timeformat', self.display_time_format)
 if dialect_options['quotechar'] == dialect_options['escapechar']:
 dialect_options['doublequote'] = True
 del dialect_options['escapechar']
@@ -1839,7 +1839,6 @@ class Shell(cmd.Cmd):
 
 meter = RateMeter(1)
 try:
-dtformats = DateTimeFormat(timestamp_format, 
self.display_date_format, self.display_nanotime_format)
 dump = self.prep_export_dump(ks, cf, columns)
 writer = csv.writer(csvdest, **dialect_options)
 if header:
@@ -1847,7 +1846,7 @@ class Shell(cmd.Cmd):
 for row in dump:
 fmt = lambda v: \
 format_value(v, output_encoding=encoding, nullval=nullval,
- time_format=dtformats,
+ time_format=time_format,
  
float_precision=self.display_float_precision).strval
 writer.writerow(map(fmt, row.values()))
 meter.increment()

[4/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: cfbe2d35b0402f8272ed562a99ff462283117d9a
Parents: 5343a75 edca4dc
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 15:26:14 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 15:26:14 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbe2d35/CHANGES.txt
--
diff --cc CHANGES.txt
index 146ee73,c33b8c9..c39f119
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,7 -3,11 +35,8 @@@ Merged from 2.2
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

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

[jira] [Commented] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10476:
--

[~slebresne] dtest PR for static_columns_paging_test: 
https://github.com/riptano/cassandra-dtest/pull/648

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging
> {code}



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

[jira] [Commented] (CASSANDRA-10633) cqlsh copy uses wrong variable name for time_format

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10633:
---

Committed as 
[81e520c54be8d397afaa0adf97178beccbf3|https://github.com/apache/cassandra/commit/81e520c54be8d397afaa0adf97178beccbf3]
 to 2.1 and merged with 2.2, 3.0, and trunk, thanks. Merged dtest PR as well.

> cqlsh copy uses wrong variable name for time_format
> ---
>
> Key: CASSANDRA-10633
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10633
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Stefania
> Fix For: 2.2.4, 2.1.12, 3.0.0
>
>
> {code}
> diff --git a/bin/cqlsh b/bin/cqlsh
> index ca45be3..ddf0314 100755
> --- a/bin/cqlsh
> +++ b/bin/cqlsh
> @@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
>  encoding = opts.pop('encoding', 'utf8')
>  nullval = opts.pop('null', '')
>  header = bool(opts.pop('header', '').lower() == 'true')
> -timestamp_format = opts.pop('time_format', 
> self.display_timestamp_format)
> +timestamp_format = opts.pop('time_format', self.display_time_format)
>  if dialect_options['quotechar'] == dialect_options['escapechar']:
>  dialect_options['doublequote'] = True
>  del dialect_options['escape char']
> {code}



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

[jira] [Comment Edited] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Jim Witschey (JIRA)]

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

Jim Witschey edited comment on CASSANDRA-10476 at 11/6/15 3:28 PM:
---

[~slebresne] [~blerer] dtest PR for static_columns_paging_test: 
https://github.com/riptano/cassandra-dtest/pull/648


was (Author: mambocab):
[~slebresne] dtest PR for static_columns_paging_test: 
https://github.com/riptano/cassandra-dtest/pull/648

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.1
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging
> {code}



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

[jira] [Updated] (CASSANDRA-10667) compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test is flapping

[Marcus Eriksson (JIRA)]

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

Marcus Eriksson updated CASSANDRA-10667:

Reviewer: Philip Thompson

> compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test
>  is flapping
> 
>
> Key: CASSANDRA-10667
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10667
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Sylvain Lebresne
>Assignee: Marcus Eriksson
> Fix For: 3.1
>
>
> See [the history of that 
> test|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/jmx_test/TestJMX/test_compactionstats/history/].
>  From the error, it sounds like the test may have some overly optimistic of 
> what to expect but I haven't looked closer.



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

[jira] [Commented] (CASSANDRA-10667) compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test is flapping

[Marcus Eriksson (JIRA)]

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

Marcus Eriksson commented on CASSANDRA-10667:
-

https://github.com/riptano/cassandra-dtest/pull/650

we should not fail if actual throughput is too low

> compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test
>  is flapping
> 
>
> Key: CASSANDRA-10667
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10667
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Sylvain Lebresne
>Assignee: Marcus Eriksson
> Fix For: 3.1
>
>
> See [the history of that 
> test|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/jmx_test/TestJMX/test_compactionstats/history/].
>  From the error, it sounds like the test may have some overly optimistic of 
> what to expect but I haven't looked closer.



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

[jira] [Updated] (CASSANDRA-10649) Improve field-checking and error reporting in cassandra.yaml

[Jim Witschey (JIRA)]

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

Jim Witschey updated CASSANDRA-10649:
-
Summary: Improve field-checking and error reporting in cassandra.yaml  
(was: Cassandra 2.1 start failed with exception:Exception encountered during 
startup)

> Improve field-checking and error reporting in cassandra.yaml
> 
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 Announcing shutdown
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Compacted 4 sstables to 
> [/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
>   11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
> partitions merged to 1.  Partition merge counts were {4:1, }
> INFO  15:52:13 Waiting for messaging service to quiesce
> INFO  15:52:13 MessagingService has terminated the accept() thread
> [root@localhost server]#
> {code}
> I've also posted the issue on stack overflow as well:
> http://stackoverflow.com/questions/33514745/cassandra-startup-failed-with-exception-exception-encountered-during-startup
> Request some one to assist on this issue.



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

[jira] [Commented] (CASSANDRA-10667) compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test is flapping

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-10667:
-

+1

> compaction_test.TestCompaction_with_LeveledCompactionStrategy.compaction_throughput_test
>  is flapping
> 
>
> Key: CASSANDRA-10667
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10667
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Sylvain Lebresne
>Assignee: Marcus Eriksson
> Fix For: 3.1
>
>
> See [the history of that 
> test|http://cassci.datastax.com/job/cassandra-3.0_dtest/335/testReport/junit/jmx_test/TestJMX/test_compactionstats/history/].
>  From the error, it sounds like the test may have some overly optimistic of 
> what to expect but I haven't looked closer.



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

[jira] [Commented] (CASSANDRA-10649) Improve field-checking and error reporting in cassandra.yaml

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10649:
--

[~sthakur] Sure, the yaml file was valid yaml; it just didn't have the correct 
fields for a cassandra.yaml file.

We should be able to improve error reporting on this, though; I've changed the 
name of the ticket to reflect that. Can C* set default values for fields not 
present in cassandra.yaml, or validate expected fields are present in the file? 
An NPE is not very helpful in cases like this.

> Improve field-checking and error reporting in cassandra.yaml
> 
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 Announcing shutdown
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Compacted 4 sstables to 
> [/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
>   11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
> partitions merged to 1.  Partition merge counts were {4:1, }
> INFO  15:52:13 Waiting for messaging service to quiesce
> INFO  15:52:13 MessagingService has terminated the accept() thread
> [root@localhost server]#
> {code}
> I've also posted the issue on stack overflow as well:
> http://stackoverflow.com/questions/33514745/cassandra-startup-failed-with-exception-exception-encountered-during-startup
> Request some one to assist on this issue.



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

[jira] [Commented] (CASSANDRA-10492) Fix failing upgrade tests on 2.1->2.2 path

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10492:


Turns out this is still a test bug, but different from what I thought. The 
server isn't timing our requests as fast as expected because the configuration 
is wrong.

What I found is that the timeouts for each read request is 10 seconds instead 
of the requested one second. This means that with six attempts it hits the 
driver's 60 second timeout some of the time.

I set request_timeout_in_ms and range_request_timeout_in_ms and now it seems to 
run through the timeouts in 2.2.1 and 2.2.2 quickly.

I updated the pull request.

> Fix failing upgrade tests on 2.1->2.2 path
> --
>
> Key: CASSANDRA-10492
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10492
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Ariel Weisberg
>  Labels: triage
> Fix For: 2.1.x, 2.2.x
>
> Attachments: test_stdout.txt
>
>
> 2 dtests for the storage engine upgrade on the 2.1->2.2 path fail:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/lastCompletedBuild/testReport/
> (If there are 3 failures at that link, don't worry; one was a dtest bug 
> that's been fixed.)
> {{upgrade_tests/cql_tests.py:TestCQL.large_count_test}} flaps when a TRUNCATE 
> operation times out:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/20/testReport/upgrade_tests.cql_tests/TestCQL/large_count_test/history/
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
>  also fails on this upgrade path:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/15/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> These are in the same ticket for the moment, but if one becomes a longer 
> project, it should be broken out into a separate ticket.



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