[jira] [Assigned] (CASSANDRA-6977) attempting to create 10K column families fails with 100 node cluster

2014-07-25 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-6977:
-

Assignee: Ryan McGuire

> attempting to create 10K column families fails with 100 node cluster
> 
>
> Key: CASSANDRA-6977
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6977
> Project: Cassandra
>  Issue Type: Bug
> Environment: 100 nodes, Ubuntu 12.04.3 LTS, AWS m1.large instances
>Reporter: Daniel Meyer
>Assignee: Ryan McGuire
>Priority: Minor
> Attachments: 100_nodes_all_data.png, all_data_5_nodes.png, 
> keyspace_create.py, logs.tar, tpstats.txt, visualvm_tracer_data.csv
>
>
> During this test we are attempting to create a total of 1K keyspaces with 10 
> column families each to bring the total column families to 10K.  With a 5 
> node cluster this operation can be completed; however, it fails with 100 
> nodes.  Please see the two charts.  For the 5 node case the time required to 
> create each keyspace and subsequent 10 column families increases linearly 
> until the number of keyspaces is 1K.  For a 100 node cluster there is a 
> sudden increase in latency between 450 keyspaces and 550 keyspaces.  The test 
> ends when the test script times out.  After the test script times out it is 
> impossible to reconnect to the cluster with the datastax python driver 
> because it cannot connect to the host:
> cassandra.cluster.NoHostAvailable: ('Unable to connect to any servers', 
> {'10.199.5.98': OperationTimedOut()}
> It was found that running the following stress command does work from the 
> same machine the test script runs on.
> cassandra-stress -d 10.199.5.98 -l 2 -e QUORUM -L3 -b -o INSERT
> It should be noted that this test was initially done with DSE 4.0 and c* 
> version 2.0.5.24 and in that case it was not possible to run stress against 
> the cluster even locally on a node due to not finding the host.
> Attached are system logs from one of the nodes, charts showing schema 
> creation latency for 5 and 100 node clusters and virtualvm tracer data for 
> cpu, memory, num_threads and gc runs, tpstat output and the test script.
> The test script was on an m1.large aws instance outside of the cluster under 
> test.



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


[jira] [Updated] (CASSANDRA-6977) attempting to create 10K column families fails with 100 node cluster

2014-07-25 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6977:
--

Priority: Minor  (was: Major)

It's worth re-testing in the post-CASSANDRA-7444 world (i.e. 2.1 branch).

> attempting to create 10K column families fails with 100 node cluster
> 
>
> Key: CASSANDRA-6977
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6977
> Project: Cassandra
>  Issue Type: Bug
> Environment: 100 nodes, Ubuntu 12.04.3 LTS, AWS m1.large instances
>Reporter: Daniel Meyer
>Priority: Minor
> Attachments: 100_nodes_all_data.png, all_data_5_nodes.png, 
> keyspace_create.py, logs.tar, tpstats.txt, visualvm_tracer_data.csv
>
>
> During this test we are attempting to create a total of 1K keyspaces with 10 
> column families each to bring the total column families to 10K.  With a 5 
> node cluster this operation can be completed; however, it fails with 100 
> nodes.  Please see the two charts.  For the 5 node case the time required to 
> create each keyspace and subsequent 10 column families increases linearly 
> until the number of keyspaces is 1K.  For a 100 node cluster there is a 
> sudden increase in latency between 450 keyspaces and 550 keyspaces.  The test 
> ends when the test script times out.  After the test script times out it is 
> impossible to reconnect to the cluster with the datastax python driver 
> because it cannot connect to the host:
> cassandra.cluster.NoHostAvailable: ('Unable to connect to any servers', 
> {'10.199.5.98': OperationTimedOut()}
> It was found that running the following stress command does work from the 
> same machine the test script runs on.
> cassandra-stress -d 10.199.5.98 -l 2 -e QUORUM -L3 -b -o INSERT
> It should be noted that this test was initially done with DSE 4.0 and c* 
> version 2.0.5.24 and in that case it was not possible to run stress against 
> the cluster even locally on a node due to not finding the host.
> Attached are system logs from one of the nodes, charts showing schema 
> creation latency for 5 and 100 node clusters and virtualvm tracer data for 
> cpu, memory, num_threads and gc runs, tpstat output and the test script.
> The test script was on an m1.large aws instance outside of the cluster under 
> test.



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


[jira] [Commented] (CASSANDRA-5902) Dealing with hints after a topology change

2014-07-25 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5902:
---

Yes.

> Dealing with hints after a topology change
> --
>
> Key: CASSANDRA-5902
> URL: https://issues.apache.org/jira/browse/CASSANDRA-5902
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jonathan Ellis
>Assignee: Ala' Alkhaldi
>Priority: Minor
>
> Hints are stored and delivered by destination node id.  This allows them to 
> survive IP changes in the target, while making "scan all the hints for a 
> given destination" an efficient operation.  However, we do not detect and 
> handle new node assuming responsibility for the hinted row via bootstrap 
> before it can be delivered.
> I think we have to take a performance hit in this case -- we need to deliver 
> such a hint to *all* replicas, since we don't know which is the "new" one.  
> This happens infrequently enough, however -- requiring first the target node 
> to be down to create the hint, then the hint owner to be down long enough for 
> the target to both recover and stream to a new node -- that this should be 
> okay.



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


[jira] [Commented] (CASSANDRA-7627) Change line-endings for all .ps1 files to be CRLF

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie commented on CASSANDRA-7627:


$ file cassandra.ps1
cassandra.ps1: ASCII text, with CRLF line terminators

LGTM

> Change line-endings for all .ps1 files to be CRLF
> -
>
> Key: CASSANDRA-7627
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7627
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Trivial
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7627_v1.txt
>
>
> Line endings on .ps1 files are currently LF only.  In the Windows ecosystem 
> it's more appropriate to be CRLF.



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


[1/3] git commit: fix nativeMaxSimultReqs

2014-07-25 Thread brandonwilliams
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ef9473a03 -> 3744d7792
  refs/heads/trunk aa25f67ea -> f3aa83be1


fix nativeMaxSimultReqs


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

Branch: refs/heads/cassandra-2.1
Commit: 3744d7792941785e6e38fefa2b50b1df5cda8791
Parents: ef9473a
Author: Brandon Williams 
Authored: Fri Jul 25 18:49:55 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 18:50:11 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3744d779/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 51d473e..bcbdb10 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,6 +127,8 @@ public class CqlNativeStorage extends CqlStorage
 CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
 if (nativeMinSimultReqs != null)
 CqlConfigHelper.setInputMinSimultReqPerConnections(conf, 
nativeMinSimultReqs);
+if (nativeMaxSimultReqs != null)
+CqlConfigHelper.setInputMaxSimultReqPerConnections(conf, 
nativeMaxSimultReqs);
 if (nativeConnectionTimeout != null)
 CqlConfigHelper.setInputNativeConnectionTimeout(conf, 
nativeConnectionTimeout);
 if (nativeReadConnectionTimeout != null)



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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f3aa83be1db07511b77ce534c127568c659ef934
Parents: aa25f67 3744d77
Author: Brandon Williams 
Authored: Fri Jul 25 18:50:18 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 18:50:18 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
 1 file changed, 2 insertions(+)
--




[2/3] git commit: fix nativeMaxSimultReqs

2014-07-25 Thread brandonwilliams
fix nativeMaxSimultReqs


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

Branch: refs/heads/trunk
Commit: 3744d7792941785e6e38fefa2b50b1df5cda8791
Parents: ef9473a
Author: Brandon Williams 
Authored: Fri Jul 25 18:49:55 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 18:50:11 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3744d779/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 51d473e..bcbdb10 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,6 +127,8 @@ public class CqlNativeStorage extends CqlStorage
 CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
 if (nativeMinSimultReqs != null)
 CqlConfigHelper.setInputMinSimultReqPerConnections(conf, 
nativeMinSimultReqs);
+if (nativeMaxSimultReqs != null)
+CqlConfigHelper.setInputMaxSimultReqPerConnections(conf, 
nativeMaxSimultReqs);
 if (nativeConnectionTimeout != null)
 CqlConfigHelper.setInputNativeConnectionTimeout(conf, 
nativeConnectionTimeout);
 if (nativeReadConnectionTimeout != null)



[jira] [Comment Edited] (CASSANDRA-5902) Dealing with hints after a topology change

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi edited comment on CASSANDRA-5902 at 7/25/14 11:30 PM:


Does [this dtest| 
https://github.com/alaalkhaldi/cassandra-dtest/commit/e03c1525949bdf9f69a40eb60587db4183e9e666]
 replicate the scenario in the ticket description ? WDYT [~jbellis]


was (Author: ala.alkhaldi):
Does [this dtest| 
https://github.com/alaalkhaldi/cassandra-dtest/commit/e03c1525949bdf9f69a40eb60587db4183e9e666]
 replicate the case in the ticket description ? 

> Dealing with hints after a topology change
> --
>
> Key: CASSANDRA-5902
> URL: https://issues.apache.org/jira/browse/CASSANDRA-5902
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jonathan Ellis
>Assignee: Ala' Alkhaldi
>Priority: Minor
>
> Hints are stored and delivered by destination node id.  This allows them to 
> survive IP changes in the target, while making "scan all the hints for a 
> given destination" an efficient operation.  However, we do not detect and 
> handle new node assuming responsibility for the hinted row via bootstrap 
> before it can be delivered.
> I think we have to take a performance hit in this case -- we need to deliver 
> such a hint to *all* replicas, since we don't know which is the "new" one.  
> This happens infrequently enough, however -- requiring first the target node 
> to be down to create the hint, then the hint owner to be down long enough for 
> the target to both recover and stream to a new node -- that this should be 
> okay.



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


[jira] [Commented] (CASSANDRA-7625) cqlsh not paging results

2014-07-25 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko commented on CASSANDRA-7625:
--

+1 (we have CASSANDRA-7514 open for paging in cqlsh).

> cqlsh not paging results
> 
>
> Key: CASSANDRA-7625
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7625
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Ryan McGuire
>Assignee: Tyler Hobbs
> Fix For: 2.1.0
>
> Attachments: 7625.txt
>
>
> If you try to make a selection of more data than can fit in a page, you'll 
> get this error:
> {code}
> cqlsh> select * from "Keyspace1"."Standard1";
> 'PagedResult' object does not support indexing
> {code}
> With debugging on, I get this traceback:
> {code}
> Traceback (most recent call last):
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 860, in 
> handle_statement
> return custom_handler(parsed)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 890, in do_select
> self.perform_statement(statement, with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 895, in 
> perform_statement
> with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 923, in 
> perform_simple_statement
> self.print_result(rows, with_default_limit, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 935, in print_result
> self.print_static_result(rows, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 961, in 
> print_static_result
> colnames = rows[0]._fields
> TypeError: 'PagedResult' object does not support indexing
> {code}
> Placing a limit on the query still works.



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


[jira] [Commented] (CASSANDRA-7621) Use jvm server machine code compiler

2014-07-25 Thread Blake Eggleston (JIRA)

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

Blake Eggleston commented on CASSANDRA-7621:


Good to know, thanks. Looks like OSX is the only OS that doesn't default to 
server nowadays.

> Use jvm server machine code compiler
> 
>
> Key: CASSANDRA-7621
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7621
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Config
>Reporter: Blake Eggleston
>Priority: Minor
>  Labels: patch
> Fix For: 2.0.10
>
> Attachments: 0001-adding-server-compiler-switch.patch
>
>
> As far as I can tell, Cassandra is using the jvm's default client compiler. 
> The attached patch adds a line to cassandra-env.sh to tell it to use the 
> jvm's server compiler. The server compiler is meant for long running 
> processes and is more aggressive in it's optimizations to the machine code it 
> generates, at the expense of machine code size and initial compilation speed.
> I've run {{cassandra-stress  --num-keys=200 -K 50}} and 
> {{cassandra-stress  --num-keys=200 -K 50 --operation=READ}} with both 
> settings, and the runs with the server flag are 2-5% faster on average on my 
> Macbook Pro, with a 2.3GHz i7, 16GB of memory and an SSD.
> http://www.oracle.com/technetwork/java/whitepaper-135217.html#2



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


[7/9] git commit: merge from 2.1.0

2014-07-25 Thread jbellis
merge from 2.1.0


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

Branch: refs/heads/trunk
Commit: ef9473a039e1a410f03dbeef76a6b20fe446d02d
Parents: 3fc8bb1 6f15fe2
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:25:59 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:25:59 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +-
 bin/cassandra-shuffle.bat  |  20 +-
 bin/cassandra.bat  |   3 +-
 bin/cassandra.ps1  | 839 
 bin/cqlsh.bat  |  68 +--
 bin/debug-cql.bat  | 100 ++---
 bin/nodetool.bat   |  20 +-
 bin/source-conf.ps1| 114 ++---
 bin/sstablekeys.bat|  26 +-
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++---
 bin/stop-server.ps1| 356 +++
 conf/cassandra-env.ps1 | 648 ++--
 tools/bin/cassandra-stress.bat |  21 +-
 tools/bin/json2sstable.bat |  25 +-
 tools/bin/sstable2json.bat |  25 +-
 tools/bin/sstablemetadata.bat  |  15 +-
 tools/bin/sstablesplit.bat | 102 ++---
 21 files changed, 1435 insertions(+), 1385 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef9473a0/CHANGES.txt
--
diff --cc CHANGES.txt
index d029b1d,0a1ba51..4ab4a36
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 +
 +
  2.1.0-final
+  * Clean up Windows batch scripts (CASSANDRA-7619)
   * Fix native protocol drop user type notification (CASSANDRA-7571)
   * Give read access to system.schema_usertypes to all authenticated users
 (CASSANDRA-7578)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef9473a0/bin/cassandra.ps1
--
diff --cc bin/cassandra.ps1
index 4417c0c,ae7182a..d6a9494
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@@ -1,283 -1,272 +1,556 @@@
- #
- # 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.
- param (
- [switch]$install,
- [switch]$uninstall,
- [switch]$help,
- [switch]$verbose,
- [switch]$f,
- [string]$p,
- [string]$H,
- [string]$E
- )
- 
- $pidfile = "pid.txt"
- 
- #-
- Function ValidateArguments
- {
- if ($install -and $uninstall)
- {
- exit
- }
- if ($help)
- {
- PrintUsage
- }
- }
- 
- #-
- Function PrintUsage
- {
- echo @"
- usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E 
errorfile] [-install | -uninstall] [-help]
- -f  Run cassandra in foreground
- -installinstall cassandra as a service
- -uninstall  remove cassandra service
- -p  pidfile tracked by server and removed on close (defaults 
to pid.txt)
- -H  change JVM HeapDumpPath
- -D  

[6/9] git commit: update .ps1 line endings to CRLF patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627

2014-07-25 Thread jbellis
update .ps1 line endings to CRLF
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627


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

Branch: refs/heads/trunk
Commit: 6f15fe260979dbaadd0f094a794a47c216f36bb0
Parents: 3e489da
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:24:03 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:24:07 2014 -0500

--
 bin/cassandra.ps1  | 544 ++---
 bin/source-conf.ps1| 114 
 bin/stop-server.ps1| 356 
 conf/cassandra-env.ps1 | 648 ++--
 4 files changed, 831 insertions(+), 831 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f15fe26/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 53b0032..ae7182a 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -1,272 +1,272 @@
-#
-# 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.
-param (
-[switch]$install,
-[switch]$uninstall,
-[switch]$help,
-[switch]$verbose,
-[switch]$f,
-[string]$p,
-[string]$H,
-[string]$E
-)
-
-$pidfile = "pid.txt"
-
-#-
-Function ValidateArguments
-{
-if ($install -and $uninstall)
-{
-exit
-}
-if ($help)
-{
-PrintUsage
-}
-}
-
-#-
-Function PrintUsage
-{
-echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-E errorfile] 
[-install | -uninstall] [-help]
--f  Run cassandra in foreground
--installinstall cassandra as a service
--uninstall  remove cassandra service
--p  pidfile tracked by server and removed on close (defaults 
to pid.txt)
--H  change JVM HeapDumpPath
--E  change JVM ErrorFile
--help   print this message
--verboseShow detailed command-line parameters for cassandra run
-
-NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
-available at http://commons.apache.org/proper/commons-daemon/";
-"@
-exit
-}
-
-#-
-# Note: throughout these scripts we're replacing \ with /.  This allows clean
-# operation on both command-prompt and cygwin-based environments.
-Function Main
-{
-ValidateArguments
-
-# support direct run of .ps1 file w/out batch file
-if ($env:CASSANDRA_HOME -eq $null)
-{
-$scriptDir = Split-Path $script:MyInvocation.MyCommand.Path
-$env:CASSANDRA_HOME = (Get-Item $scriptDir).parent.FullName
-}
-. "$env:CASSANDRA_HOME\bin\source-conf.ps1"
-
-$conf = Find-Conf
-if ($verbose)
-{
-echo "Sourcing cassandra config file: $conf"
-}
-. $conf
-
-SetCassandraEnvironment
-$pidfile = "$env:CASSANDRA_HOME\$pidfile"
-
-$logdir = "$env:CASSANDRA_HOME/logs"
-$storagedir = "$env:CASSANDRA_HOME/data"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " 
-Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
-
-# Other command line params
-if ($H)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:HeapDumpPath=$H"
-}
-if ($E)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:ErrorFile=$E"
-}
-if ($p)
-{
-$pidfile = "$p"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + ' 
-Dcassandra-pidfile="' + "$pidfile" + '"'
-}
-
-if ($install -or $uninstall)
-{
-HandleInstallation
-}
-else
-{
-RunCassandra($f)
-}
-}
-
-#-
-Function HandleInstall

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

2014-07-25 Thread jbellis
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: aa25f67eaff3b620d635a07e1f6b60466dac3c10
Parents: 6477fa9 ef9473a
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:26:05 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:26:05 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +-
 bin/cassandra-shuffle.bat  |  20 +-
 bin/cassandra.bat  |   3 +-
 bin/cassandra.ps1  | 839 
 bin/cqlsh.bat  |  68 +--
 bin/debug-cql.bat  | 100 ++---
 bin/nodetool.bat   |  20 +-
 bin/source-conf.ps1| 114 ++---
 bin/sstablekeys.bat|  26 +-
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++---
 bin/stop-server.ps1| 356 +++
 conf/cassandra-env.ps1 | 648 ++--
 tools/bin/cassandra-stress.bat |  21 +-
 tools/bin/json2sstable.bat |  25 +-
 tools/bin/sstable2json.bat |  25 +-
 tools/bin/sstablemetadata.bat  |  15 +-
 tools/bin/sstablesplit.bat | 102 ++---
 21 files changed, 1435 insertions(+), 1385 deletions(-)
--


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



[3/9] git commit: Clean up Windows batch scripts patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619

2014-07-25 Thread jbellis
Clean up Windows batch scripts
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619


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

Branch: refs/heads/trunk
Commit: 3e489dad7d56b0a6a4084cd3f17a86ec41cb9fd5
Parents: 83b3f13
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:23:11 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:23:11 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +--
 bin/cassandra-shuffle.bat  |  20 +--
 bin/cassandra.bat  |   3 +-
 bin/cqlsh.bat  |  68 +++---
 bin/debug-cql.bat  | 100 +---
 bin/nodetool.bat   |  20 +--
 bin/sstablekeys.bat|  26 +
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++--
 tools/bin/cassandra-stress.bat |  21 ++-
 tools/bin/json2sstable.bat |  25 +---
 tools/bin/sstable2json.bat |  25 +---
 tools/bin/sstablemetadata.bat  |  15 +
 tools/bin/sstablesplit.bat | 102 ++---
 17 files changed, 320 insertions(+), 543 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d6dcfc9..0a1ba51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0-final
+ * Clean up Windows batch scripts (CASSANDRA-7619)
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-cli.bat
--
diff --git a/bin/cassandra-cli.bat b/bin/cassandra-cli.bat
index 0d52bdf..6211371 100644
--- a/bin/cassandra-cli.bat
+++ b/bin/cassandra-cli.bat
@@ -14,30 +14,15 @@
 @REM  See the License for the specific language governing permissions and
 @REM  limitations under the License.
 
-
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.cli.CliMain %*
 goto finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-shuffle.bat
--
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
index d920d09..494973c 100644
--- a/bin/cassandra-shuffle.bat
+++ b/bin/cassandra-shuffle.bat
@@ -18,26 +18,12 @@
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.tools.Shuffle %*
 goto finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra.bat
--
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 08c05

[5/9] git commit: update .ps1 line endings to CRLF patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627

2014-07-25 Thread jbellis
update .ps1 line endings to CRLF
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627


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

Branch: refs/heads/cassandra-2.1.0
Commit: 6f15fe260979dbaadd0f094a794a47c216f36bb0
Parents: 3e489da
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:24:03 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:24:07 2014 -0500

--
 bin/cassandra.ps1  | 544 ++---
 bin/source-conf.ps1| 114 
 bin/stop-server.ps1| 356 
 conf/cassandra-env.ps1 | 648 ++--
 4 files changed, 831 insertions(+), 831 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f15fe26/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 53b0032..ae7182a 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -1,272 +1,272 @@
-#
-# 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.
-param (
-[switch]$install,
-[switch]$uninstall,
-[switch]$help,
-[switch]$verbose,
-[switch]$f,
-[string]$p,
-[string]$H,
-[string]$E
-)
-
-$pidfile = "pid.txt"
-
-#-
-Function ValidateArguments
-{
-if ($install -and $uninstall)
-{
-exit
-}
-if ($help)
-{
-PrintUsage
-}
-}
-
-#-
-Function PrintUsage
-{
-echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-E errorfile] 
[-install | -uninstall] [-help]
--f  Run cassandra in foreground
--installinstall cassandra as a service
--uninstall  remove cassandra service
--p  pidfile tracked by server and removed on close (defaults 
to pid.txt)
--H  change JVM HeapDumpPath
--E  change JVM ErrorFile
--help   print this message
--verboseShow detailed command-line parameters for cassandra run
-
-NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
-available at http://commons.apache.org/proper/commons-daemon/";
-"@
-exit
-}
-
-#-
-# Note: throughout these scripts we're replacing \ with /.  This allows clean
-# operation on both command-prompt and cygwin-based environments.
-Function Main
-{
-ValidateArguments
-
-# support direct run of .ps1 file w/out batch file
-if ($env:CASSANDRA_HOME -eq $null)
-{
-$scriptDir = Split-Path $script:MyInvocation.MyCommand.Path
-$env:CASSANDRA_HOME = (Get-Item $scriptDir).parent.FullName
-}
-. "$env:CASSANDRA_HOME\bin\source-conf.ps1"
-
-$conf = Find-Conf
-if ($verbose)
-{
-echo "Sourcing cassandra config file: $conf"
-}
-. $conf
-
-SetCassandraEnvironment
-$pidfile = "$env:CASSANDRA_HOME\$pidfile"
-
-$logdir = "$env:CASSANDRA_HOME/logs"
-$storagedir = "$env:CASSANDRA_HOME/data"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " 
-Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
-
-# Other command line params
-if ($H)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:HeapDumpPath=$H"
-}
-if ($E)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:ErrorFile=$E"
-}
-if ($p)
-{
-$pidfile = "$p"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + ' 
-Dcassandra-pidfile="' + "$pidfile" + '"'
-}
-
-if ($install -or $uninstall)
-{
-HandleInstallation
-}
-else
-{
-RunCassandra($f)
-}
-}
-
-#-
-Function Han

[1/9] git commit: Clean up Windows batch scripts patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619

2014-07-25 Thread jbellis
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3fc8bb1ed -> ef9473a03
  refs/heads/cassandra-2.1.0 83b3f1306 -> 6f15fe260
  refs/heads/trunk 6477fa95f -> aa25f67ea


Clean up Windows batch scripts
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619


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

Branch: refs/heads/cassandra-2.1
Commit: 3e489dad7d56b0a6a4084cd3f17a86ec41cb9fd5
Parents: 83b3f13
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:23:11 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:23:11 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +--
 bin/cassandra-shuffle.bat  |  20 +--
 bin/cassandra.bat  |   3 +-
 bin/cqlsh.bat  |  68 +++---
 bin/debug-cql.bat  | 100 +---
 bin/nodetool.bat   |  20 +--
 bin/sstablekeys.bat|  26 +
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++--
 tools/bin/cassandra-stress.bat |  21 ++-
 tools/bin/json2sstable.bat |  25 +---
 tools/bin/sstable2json.bat |  25 +---
 tools/bin/sstablemetadata.bat  |  15 +
 tools/bin/sstablesplit.bat | 102 ++---
 17 files changed, 320 insertions(+), 543 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d6dcfc9..0a1ba51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0-final
+ * Clean up Windows batch scripts (CASSANDRA-7619)
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-cli.bat
--
diff --git a/bin/cassandra-cli.bat b/bin/cassandra-cli.bat
index 0d52bdf..6211371 100644
--- a/bin/cassandra-cli.bat
+++ b/bin/cassandra-cli.bat
@@ -14,30 +14,15 @@
 @REM  See the License for the specific language governing permissions and
 @REM  limitations under the License.
 
-
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.cli.CliMain %*
 goto finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-shuffle.bat
--
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
index d920d09..494973c 100644
--- a/bin/cassandra-shuffle.bat
+++ b/bin/cassandra-shuffle.bat
@@ -18,26 +18,12 @@
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.tools.Shuffle %*
 goto finally

http://git-wip-us.ap

[8/9] git commit: merge from 2.1.0

2014-07-25 Thread jbellis
merge from 2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: ef9473a039e1a410f03dbeef76a6b20fe446d02d
Parents: 3fc8bb1 6f15fe2
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:25:59 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:25:59 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +-
 bin/cassandra-shuffle.bat  |  20 +-
 bin/cassandra.bat  |   3 +-
 bin/cassandra.ps1  | 839 
 bin/cqlsh.bat  |  68 +--
 bin/debug-cql.bat  | 100 ++---
 bin/nodetool.bat   |  20 +-
 bin/source-conf.ps1| 114 ++---
 bin/sstablekeys.bat|  26 +-
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++---
 bin/stop-server.ps1| 356 +++
 conf/cassandra-env.ps1 | 648 ++--
 tools/bin/cassandra-stress.bat |  21 +-
 tools/bin/json2sstable.bat |  25 +-
 tools/bin/sstable2json.bat |  25 +-
 tools/bin/sstablemetadata.bat  |  15 +-
 tools/bin/sstablesplit.bat | 102 ++---
 21 files changed, 1435 insertions(+), 1385 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef9473a0/CHANGES.txt
--
diff --cc CHANGES.txt
index d029b1d,0a1ba51..4ab4a36
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 +
 +
  2.1.0-final
+  * Clean up Windows batch scripts (CASSANDRA-7619)
   * Fix native protocol drop user type notification (CASSANDRA-7571)
   * Give read access to system.schema_usertypes to all authenticated users
 (CASSANDRA-7578)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef9473a0/bin/cassandra.ps1
--
diff --cc bin/cassandra.ps1
index 4417c0c,ae7182a..d6a9494
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@@ -1,283 -1,272 +1,556 @@@
- #
- # 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.
- param (
- [switch]$install,
- [switch]$uninstall,
- [switch]$help,
- [switch]$verbose,
- [switch]$f,
- [string]$p,
- [string]$H,
- [string]$E
- )
- 
- $pidfile = "pid.txt"
- 
- #-
- Function ValidateArguments
- {
- if ($install -and $uninstall)
- {
- exit
- }
- if ($help)
- {
- PrintUsage
- }
- }
- 
- #-
- Function PrintUsage
- {
- echo @"
- usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E 
errorfile] [-install | -uninstall] [-help]
- -f  Run cassandra in foreground
- -installinstall cassandra as a service
- -uninstall  remove cassandra service
- -p  pidfile tracked by server and removed on close (defaults 
to pid.txt)
- -H  change JVM HeapDumpPath
- 

[4/9] git commit: update .ps1 line endings to CRLF patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627

2014-07-25 Thread jbellis
update .ps1 line endings to CRLF
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627


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

Branch: refs/heads/cassandra-2.1
Commit: 6f15fe260979dbaadd0f094a794a47c216f36bb0
Parents: 3e489da
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:24:03 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:24:07 2014 -0500

--
 bin/cassandra.ps1  | 544 ++---
 bin/source-conf.ps1| 114 
 bin/stop-server.ps1| 356 
 conf/cassandra-env.ps1 | 648 ++--
 4 files changed, 831 insertions(+), 831 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f15fe26/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 53b0032..ae7182a 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -1,272 +1,272 @@
-#
-# 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.
-param (
-[switch]$install,
-[switch]$uninstall,
-[switch]$help,
-[switch]$verbose,
-[switch]$f,
-[string]$p,
-[string]$H,
-[string]$E
-)
-
-$pidfile = "pid.txt"
-
-#-
-Function ValidateArguments
-{
-if ($install -and $uninstall)
-{
-exit
-}
-if ($help)
-{
-PrintUsage
-}
-}
-
-#-
-Function PrintUsage
-{
-echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-E errorfile] 
[-install | -uninstall] [-help]
--f  Run cassandra in foreground
--installinstall cassandra as a service
--uninstall  remove cassandra service
--p  pidfile tracked by server and removed on close (defaults 
to pid.txt)
--H  change JVM HeapDumpPath
--E  change JVM ErrorFile
--help   print this message
--verboseShow detailed command-line parameters for cassandra run
-
-NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
-available at http://commons.apache.org/proper/commons-daemon/";
-"@
-exit
-}
-
-#-
-# Note: throughout these scripts we're replacing \ with /.  This allows clean
-# operation on both command-prompt and cygwin-based environments.
-Function Main
-{
-ValidateArguments
-
-# support direct run of .ps1 file w/out batch file
-if ($env:CASSANDRA_HOME -eq $null)
-{
-$scriptDir = Split-Path $script:MyInvocation.MyCommand.Path
-$env:CASSANDRA_HOME = (Get-Item $scriptDir).parent.FullName
-}
-. "$env:CASSANDRA_HOME\bin\source-conf.ps1"
-
-$conf = Find-Conf
-if ($verbose)
-{
-echo "Sourcing cassandra config file: $conf"
-}
-. $conf
-
-SetCassandraEnvironment
-$pidfile = "$env:CASSANDRA_HOME\$pidfile"
-
-$logdir = "$env:CASSANDRA_HOME/logs"
-$storagedir = "$env:CASSANDRA_HOME/data"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " 
-Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
-
-# Other command line params
-if ($H)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:HeapDumpPath=$H"
-}
-if ($E)
-{
-$env:JVM_OPTS = $env:JVM_OPTS + " -XX:ErrorFile=$E"
-}
-if ($p)
-{
-$pidfile = "$p"
-$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + ' 
-Dcassandra-pidfile="' + "$pidfile" + '"'
-}
-
-if ($install -or $uninstall)
-{
-HandleInstallation
-}
-else
-{
-RunCassandra($f)
-}
-}
-
-#-
-Function Handl

[2/9] git commit: Clean up Windows batch scripts patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619

2014-07-25 Thread jbellis
Clean up Windows batch scripts
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619


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

Branch: refs/heads/cassandra-2.1.0
Commit: 3e489dad7d56b0a6a4084cd3f17a86ec41cb9fd5
Parents: 83b3f13
Author: Jonathan Ellis 
Authored: Fri Jul 25 17:23:11 2014 -0500
Committer: Jonathan Ellis 
Committed: Fri Jul 25 17:23:11 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +--
 bin/cassandra-shuffle.bat  |  20 +--
 bin/cassandra.bat  |   3 +-
 bin/cqlsh.bat  |  68 +++---
 bin/debug-cql.bat  | 100 +---
 bin/nodetool.bat   |  20 +--
 bin/sstablekeys.bat|  26 +
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++--
 tools/bin/cassandra-stress.bat |  21 ++-
 tools/bin/json2sstable.bat |  25 +---
 tools/bin/sstable2json.bat |  25 +---
 tools/bin/sstablemetadata.bat  |  15 +
 tools/bin/sstablesplit.bat | 102 ++---
 17 files changed, 320 insertions(+), 543 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d6dcfc9..0a1ba51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0-final
+ * Clean up Windows batch scripts (CASSANDRA-7619)
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-cli.bat
--
diff --git a/bin/cassandra-cli.bat b/bin/cassandra-cli.bat
index 0d52bdf..6211371 100644
--- a/bin/cassandra-cli.bat
+++ b/bin/cassandra-cli.bat
@@ -14,30 +14,15 @@
 @REM  See the License for the specific language governing permissions and
 @REM  limitations under the License.
 
-
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.cli.CliMain %*
 goto finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra-shuffle.bat
--
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
index d920d09..494973c 100644
--- a/bin/cassandra-shuffle.bat
+++ b/bin/cassandra-shuffle.bat
@@ -18,26 +18,12 @@
 @echo off
 if "%OS%" == "Windows_NT" setlocal
 
+pushd "%~dp0"
+call cassandra.in.bat
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err
 
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set 
CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
 echo Starting Cassandra Client
 "%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.tools.Shuffle %*
 goto finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e489dad/bin/cassandra.bat
--
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
i

[jira] [Assigned] (CASSANDRA-5902) Dealing with hints after a topology change

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi reassigned CASSANDRA-5902:


Assignee: Ala' Alkhaldi

> Dealing with hints after a topology change
> --
>
> Key: CASSANDRA-5902
> URL: https://issues.apache.org/jira/browse/CASSANDRA-5902
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jonathan Ellis
>Assignee: Ala' Alkhaldi
>Priority: Minor
>
> Hints are stored and delivered by destination node id.  This allows them to 
> survive IP changes in the target, while making "scan all the hints for a 
> given destination" an efficient operation.  However, we do not detect and 
> handle new node assuming responsibility for the hinted row via bootstrap 
> before it can be delivered.
> I think we have to take a performance hit in this case -- we need to deliver 
> such a hint to *all* replicas, since we don't know which is the "new" one.  
> This happens infrequently enough, however -- requiring first the target node 
> to be down to create the hint, then the hint owner to be down long enough for 
> the target to both recover and stream to a new node -- that this should be 
> okay.



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


[jira] [Commented] (CASSANDRA-5902) Dealing with hints after a topology change

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi commented on CASSANDRA-5902:
--

Does [this dtest| 
https://github.com/alaalkhaldi/cassandra-dtest/commit/e03c1525949bdf9f69a40eb60587db4183e9e666]
 replicate the case in the ticket description ? 

> Dealing with hints after a topology change
> --
>
> Key: CASSANDRA-5902
> URL: https://issues.apache.org/jira/browse/CASSANDRA-5902
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jonathan Ellis
>Priority: Minor
>
> Hints are stored and delivered by destination node id.  This allows them to 
> survive IP changes in the target, while making "scan all the hints for a 
> given destination" an efficient operation.  However, we do not detect and 
> handle new node assuming responsibility for the hinted row via bootstrap 
> before it can be delivered.
> I think we have to take a performance hit in this case -- we need to deliver 
> such a hint to *all* replicas, since we don't know which is the "new" one.  
> This happens infrequently enough, however -- requiring first the target node 
> to be down to create the hint, then the hint owner to be down long enough for 
> the target to both recover and stream to a new node -- that this should be 
> okay.



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


[jira] [Commented] (CASSANDRA-7627) Change line-endings for all .ps1 files to be CRLF

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi commented on CASSANDRA-7627:
--

+1

> Change line-endings for all .ps1 files to be CRLF
> -
>
> Key: CASSANDRA-7627
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7627
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Trivial
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7627_v1.txt
>
>
> Line endings on .ps1 files are currently LF only.  In the Windows ecosystem 
> it's more appropriate to be CRLF.



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


[jira] [Commented] (CASSANDRA-7186) alter table add column not always propogating

2014-07-25 Thread Shefali (JIRA)

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

Shefali commented on CASSANDRA-7186:


I am using 2.0.9 and I continuously encounter this issue.

> alter table add column not always propogating
> -
>
> Key: CASSANDRA-7186
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7186
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Martin Meyer
>
> I've been many times in Cassandra 2.0.6 that adding columns to existing 
> tables seems to not fully propagate to our entire cluster. We add an extra 
> column to various tables maybe 0-2 times a week, and so far many of these 
> ALTERs have resulted in at least one node showing the old table description a 
> pretty long time (~30 mins) after the original ALTER command was issued.
> We originally identified this issue when a connected clients would complain 
> that a column it issued a SELECT for wasn't a known column, at which point we 
> have to ask each node to describe the most recently altered table. One of 
> them will not know about the newly added field. Issuing the original ALTER 
> statement on that node makes everything work correctly.
> We have seen this issue on multiple tables (we don't always alter the same 
> one). It has affected various nodes in the cluster (not always the same one 
> is not getting the mutation propagated). No new nodes have been added to the 
> cluster recently. All nodes are homogenous (hardware and software), running 
> 2.0.6. We don't see any particular errors or exceptions on the node that 
> didn't get the schema update, only the later error from a Java client about 
> asking for an unknown column in a SELECT. We have to check each node manually 
> to find the offender. The tables he have seen this on are under fairly heavy 
> read and write load, but we haven't altered any tables that are not, so that 
> might not be important.



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


[jira] [Commented] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi commented on CASSANDRA-7619:
--

v4 LGTM. +1

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt, 7619_v4.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


[jira] [Created] (CASSANDRA-7629) tracing no longer logs when the request completed

2014-07-25 Thread Brandon Williams (JIRA)
Brandon Williams created CASSANDRA-7629:
---

 Summary: tracing no longer logs when the request completed
 Key: CASSANDRA-7629
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7629
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
 Fix For: 2.1.0


In 2.0 and before, there is a "Request complete" entry in tracing, which no 
longer appears in 2.1.  This makes it difficult to reason about 
latency/performance problems in a trace.



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


[jira] [Commented] (CASSANDRA-7626) Tracing problems with 2.1 cqlsh

2014-07-25 Thread Tyler Hobbs (JIRA)

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

Tyler Hobbs commented on CASSANDRA-7626:


Actually, I believe the microseconds issue may be a bug with tracing in 
Cassandra itself.

> Tracing problems with 2.1 cqlsh
> ---
>
> Key: CASSANDRA-7626
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7626
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Tyler Hobbs
>Assignee: Tyler Hobbs
>Priority: Minor
> Fix For: 2.1.0
>
>
> If some replicas continue doing work after the coordinator responds to the 
> client (e.g. writing at CL.ONE with RF=3), those trace events will not have a 
> source_elapsed field, leading to the following error in cqlsh:
> {noformat}
> Traceback (most recent call last):
>   File "bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "bin/cqlsh", line 863, in handle_statement
> return self.perform_statement(cqlruleset.cql_extract_orig(tokens, srcstr))
>   File "bin/cqlsh", line 898, in perform_statement
> print_trace_session(self, self.session, stmt.trace.trace_id)
>   File "/srv/cassandra/bin/../pylib/cqlshlib/tracing.py", line 25, in 
> print_trace_session
> rows = fetch_trace_session(trace)
>   File "/srv/cassandra/bin/../pylib/cqlshlib/tracing.py", line 54, in 
> fetch_trace_session
> event.source_elapsed.microseconds])
> AttributeError: 'NoneType' object has no attribute 'microseconds'
> {noformat}
> If the trace wasn't fully written within the driver's 2 second waiting 
> period, you'll get this error:
> {noformat}
> Traceback (most recent call last):
>   File "bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "bin/cqlsh", line 863, in handle_statement
> return self.perform_statement(cqlruleset.cql_extract_orig(tokens, srcstr))
>   File "bin/cqlsh", line 898, in perform_statement
> print_trace_session(self, self.session, stmt.trace.trace_id)
> AttributeError: 'NoneType' object has no attribute 'trace_id'
> {noformat}



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


[jira] [Updated] (CASSANDRA-7627) Change line-endings for all .ps1 files to be CRLF

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie updated CASSANDRA-7627:
---

Attachment: 7627_v1.txt

v1 - simple unix2dos run against the .ps1 files in conf and bin.

> Change line-endings for all .ps1 files to be CRLF
> -
>
> Key: CASSANDRA-7627
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7627
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Trivial
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7627_v1.txt
>
>
> Line endings on .ps1 files are currently LF only.  In the Windows ecosystem 
> it's more appropriate to be CRLF.



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


[jira] [Created] (CASSANDRA-7628) Tools java driver needs to be updated

2014-07-25 Thread Brandon Williams (JIRA)
Brandon Williams created CASSANDRA-7628:
---

 Summary: Tools java driver needs to be updated
 Key: CASSANDRA-7628
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7628
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Brandon Williams
Priority: Minor
 Fix For: 2.1.0


When you run stress currently you get a bunch of harmless stacktraces like:

{noformat}
ERROR 21:11:51 Error parsing schema options for table system_traces.sessions: 
Cluster.getMetadata().getKeyspace("system_traces").getTable("sessions").getOptions()
 will return null
java.lang.IllegalArgumentException: populate_io_cache_on_flush is not a column 
defined in this metadata
at 
com.datastax.driver.core.ColumnDefinitions.getAllIdx(ColumnDefinitions.java:273)
 ~[cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ColumnDefinitions.getFirstIdx(ColumnDefinitions.java:279)
 ~[cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ArrayBackedRow.isNull(ArrayBackedRow.java:56) 
~[cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.TableMetadata$Options.(TableMetadata.java:529) 
~[cassandra-driver-core-2.0.1.jar:na]
at com.datastax.driver.core.TableMetadata.build(TableMetadata.java:119) 
~[cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.Metadata.buildTableMetadata(Metadata.java:131) 
[cassandra-driver-core-2.0.1.jar:na]
at com.datastax.driver.core.Metadata.rebuildSchema(Metadata.java:92) 
[cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ControlConnection.refreshSchema(ControlConnection.java:293)
 [cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ControlConnection.tryConnect(ControlConnection.java:230)
 [cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ControlConnection.reconnectInternal(ControlConnection.java:170)
 [cassandra-driver-core-2.0.1.jar:na]
at 
com.datastax.driver.core.ControlConnection.connect(ControlConnection.java:78) 
[cassandra-driver-core-2.0.1.jar:na]
at com.datastax.driver.core.Cluster$Manager.init(Cluster.java:1029) 
[cassandra-driver-core-2.0.1.jar:na]
at com.datastax.driver.core.Cluster.getMetadata(Cluster.java:270) 
[cassandra-driver-core-2.0.1.jar:na]
at 
org.apache.cassandra.stress.util.JavaDriverClient.connect(JavaDriverClient.java:90)
 [stress/:na]
at 
org.apache.cassandra.stress.settings.StressSettings.getJavaDriverClient(StressSettings.java:177)
 [stress/:na]
at 
org.apache.cassandra.stress.settings.StressSettings.getJavaDriverClient(StressSettings.java:159)
 [stress/:na]
at 
org.apache.cassandra.stress.StressAction$Consumer.run(StressAction.java:264) 
[stress/:na]
{noformat}



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


[jira] [Created] (CASSANDRA-7627) Change line-endings for all .ps1 files to be CRLF

2014-07-25 Thread Joshua McKenzie (JIRA)
Joshua McKenzie created CASSANDRA-7627:
--

 Summary: Change line-endings for all .ps1 files to be CRLF
 Key: CASSANDRA-7627
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7627
 Project: Cassandra
  Issue Type: Bug
Reporter: Joshua McKenzie
Assignee: Joshua McKenzie
Priority: Trivial
 Fix For: 2.1.0


Line endings on .ps1 files are currently LF only.  In the Windows ecosystem 
it's more appropriate to be CRLF.



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


[jira] [Updated] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie updated CASSANDRA-7619:
---

Attachment: 7619_v4.txt

v4 attached that also converts line endings on all batch files to be uniformly 
CRLF.

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt, 7619_v4.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


[jira] [Created] (CASSANDRA-7626) Tracing problems with 2.1 cqlsh

2014-07-25 Thread Tyler Hobbs (JIRA)
Tyler Hobbs created CASSANDRA-7626:
--

 Summary: Tracing problems with 2.1 cqlsh
 Key: CASSANDRA-7626
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7626
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Tyler Hobbs
Assignee: Tyler Hobbs
Priority: Minor
 Fix For: 2.1.0


If some replicas continue doing work after the coordinator responds to the 
client (e.g. writing at CL.ONE with RF=3), those trace events will not have a 
source_elapsed field, leading to the following error in cqlsh:

{noformat}


Traceback (most recent call last):
  File "bin/cqlsh", line 822, in onecmd
self.handle_statement(st, statementtext)
  File "bin/cqlsh", line 863, in handle_statement
return self.perform_statement(cqlruleset.cql_extract_orig(tokens, srcstr))
  File "bin/cqlsh", line 898, in perform_statement
print_trace_session(self, self.session, stmt.trace.trace_id)
  File "/srv/cassandra/bin/../pylib/cqlshlib/tracing.py", line 25, in 
print_trace_session
rows = fetch_trace_session(trace)
  File "/srv/cassandra/bin/../pylib/cqlshlib/tracing.py", line 54, in 
fetch_trace_session
event.source_elapsed.microseconds])
AttributeError: 'NoneType' object has no attribute 'microseconds'
{noformat}

If the trace wasn't fully written within the driver's 2 second waiting period, 
you'll get this error:
{noformat}
Traceback (most recent call last):
  File "bin/cqlsh", line 822, in onecmd
self.handle_statement(st, statementtext)
  File "bin/cqlsh", line 863, in handle_statement
return self.perform_statement(cqlruleset.cql_extract_orig(tokens, srcstr))
  File "bin/cqlsh", line 898, in perform_statement
print_trace_session(self, self.session, stmt.trace.trace_id)
AttributeError: 'NoneType' object has no attribute 'trace_id'
{noformat}



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


[jira] [Updated] (CASSANDRA-7625) cqlsh not paging results

2014-07-25 Thread Tyler Hobbs (JIRA)

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

Tyler Hobbs updated CASSANDRA-7625:
---

Attachment: 7625.txt

7625.txt (and [branch|https://github.com/thobbs/cassandra/tree/CASSANDRA-7625]) 
always converts the result to a list in order to handle paged results.

(While it would be nice if cqlsh actually utilized the paging instead of 
converting everything to a list, the formatting code requires knowing the max 
length of values in the results up front.  At least with paged results, only 
cqlsh will suffer instead of the coordinator node.)

> cqlsh not paging results
> 
>
> Key: CASSANDRA-7625
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7625
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Ryan McGuire
>Assignee: Tyler Hobbs
> Fix For: 2.1.0
>
> Attachments: 7625.txt
>
>
> If you try to make a selection of more data than can fit in a page, you'll 
> get this error:
> {code}
> cqlsh> select * from "Keyspace1"."Standard1";
> 'PagedResult' object does not support indexing
> {code}
> With debugging on, I get this traceback:
> {code}
> Traceback (most recent call last):
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 860, in 
> handle_statement
> return custom_handler(parsed)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 890, in do_select
> self.perform_statement(statement, with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 895, in 
> perform_statement
> with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 923, in 
> perform_simple_statement
> self.print_result(rows, with_default_limit, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 935, in print_result
> self.print_static_result(rows, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 961, in 
> print_static_result
> colnames = rows[0]._fields
> TypeError: 'PagedResult' object does not support indexing
> {code}
> Placing a limit on the query still works.



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


[jira] [Commented] (CASSANDRA-7567) when the commit_log disk for a single node is overwhelmed the entire cluster slows down

2014-07-25 Thread Ryan McGuire (JIRA)

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

Ryan McGuire commented on CASSANDRA-7567:
-

{code}
cqlsh> select activity, source, source_elapsed, thread from 
system_traces.events where session_id = f0c14390-1434-11e4-bbc2-1511583f4f50;

 activity | source | source_elapsed | 
thread
--+++---
Message received from /10.109.137.124 | 10.111.173.249 | 50 |   
  Thread-11
Determining replicas for mutation | 10.109.137.124 |158 |   
 Thrift:116
   Sending message to /10.111.173.249 | 10.109.137.124 |303 | 
WRITE-/10.111.173.249
Sending message to /10.180.41.228 | 10.109.137.124 |303 |  
WRITE-/10.180.41.228
Message received from /10.109.137.124 |  10.180.41.228 | 36 |   
  Thread-28
   Appending to commitlog | 10.111.173.249 |  94484 |  
SharedPool-Worker-29
 Adding to Standard1 memtable | 10.111.173.249 |  94569 |  
SharedPool-Worker-29
Enqueuing response to /10.109.137.124 | 10.111.173.249 |  94636 |  
SharedPool-Worker-29
   Sending message to /10.109.137.124 | 10.111.173.249 |  94752 | 
WRITE-/10.109.137.124
Message received from /10.111.173.249 | 10.109.137.124 |  95898 |   
   Thread-4
 Processing response from /10.111.173.249 | 10.109.137.124 |  96001 |  
SharedPool-Worker-11

(11 rows)
{code}

> when the commit_log disk for a single node is overwhelmed the entire cluster 
> slows down
> ---
>
> Key: CASSANDRA-7567
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7567
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
> Environment: debian 7.5, bare metal, 14 nodes, 64CPUs, 64GB RAM, 
> commit_log disk sata, data disk SSD, vnodes, leveled compaction strategy
>Reporter: David O'Dell
>Assignee: Brandon Williams
> Attachments: 7567.logs.bz2, write_request_latency.png
>
>
> We've run into a situation where a single node out of 14 is experiencing high 
> disk io. This can happen when a node is being decommissioned or after it 
> joins the ring and runs into the bug cassandra-6621.
> When this occurs the write latency for the entire cluster spikes.
> From 0.3ms to 170ms.
> To simulate this simply run dd on the commit_log disk (dd if=/dev/zero 
> of=/tmp/foo bs=1024) and you will see that instantly all nodes in the cluster 
> have slowed down.
> BTW overwhelming the data disk does not have this same effect.
> Also I've tried this where the overwhelmed node isn't being connected 
> directly from the client and it still has the same effect.



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


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

2014-07-25 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7575:
--

Fix Version/s: 3.0
   2.1.0

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



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


[jira] [Assigned] (CASSANDRA-7625) cqlsh not paging results

2014-07-25 Thread Ryan McGuire (JIRA)

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

Ryan McGuire reassigned CASSANDRA-7625:
---

Assignee: Tyler Hobbs

> cqlsh not paging results
> 
>
> Key: CASSANDRA-7625
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7625
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Ryan McGuire
>Assignee: Tyler Hobbs
>
> If you try to make a selection of more data than can fit in a page, you'll 
> get this error:
> {code}
> cqlsh> select * from "Keyspace1"."Standard1";
> 'PagedResult' object does not support indexing
> {code}
> With debugging on, I get this traceback:
> {code}
> Traceback (most recent call last):
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 860, in 
> handle_statement
> return custom_handler(parsed)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 890, in do_select
> self.perform_statement(statement, with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 895, in 
> perform_statement
> with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 923, in 
> perform_simple_statement
> self.print_result(rows, with_default_limit, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 935, in print_result
> self.print_static_result(rows, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 961, in 
> print_static_result
> colnames = rows[0]._fields
> TypeError: 'PagedResult' object does not support indexing
> {code}
> Placing a limit on the query still works.



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


[jira] [Updated] (CASSANDRA-7625) cqlsh not paging results

2014-07-25 Thread Ryan McGuire (JIRA)

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

Ryan McGuire updated CASSANDRA-7625:


Reproduced In: 2.1 rc4

> cqlsh not paging results
> 
>
> Key: CASSANDRA-7625
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7625
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Ryan McGuire
>Assignee: Tyler Hobbs
>
> If you try to make a selection of more data than can fit in a page, you'll 
> get this error:
> {code}
> cqlsh> select * from "Keyspace1"."Standard1";
> 'PagedResult' object does not support indexing
> {code}
> With debugging on, I get this traceback:
> {code}
> Traceback (most recent call last):
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 822, in onecmd
> self.handle_statement(st, statementtext)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 860, in 
> handle_statement
> return custom_handler(parsed)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 890, in do_select
> self.perform_statement(statement, with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 895, in 
> perform_statement
> with_default_limit=with_default_limit)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 923, in 
> perform_simple_statement
> self.print_result(rows, with_default_limit, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 935, in print_result
> self.print_static_result(rows, cfMetaData)
>   File "/home/automaton/fab/cassandra/bin/cqlsh", line 961, in 
> print_static_result
> colnames = rows[0]._fields
> TypeError: 'PagedResult' object does not support indexing
> {code}
> Placing a limit on the query still works.



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


[jira] [Created] (CASSANDRA-7625) cqlsh not paging results

2014-07-25 Thread Ryan McGuire (JIRA)
Ryan McGuire created CASSANDRA-7625:
---

 Summary: cqlsh not paging results
 Key: CASSANDRA-7625
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7625
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Ryan McGuire


If you try to make a selection of more data than can fit in a page, you'll get 
this error:

{code}
cqlsh> select * from "Keyspace1"."Standard1";

'PagedResult' object does not support indexing
{code}

With debugging on, I get this traceback:

{code}
Traceback (most recent call last):
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 822, in onecmd
self.handle_statement(st, statementtext)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 860, in handle_statement
return custom_handler(parsed)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 890, in do_select
self.perform_statement(statement, with_default_limit=with_default_limit)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 895, in perform_statement
with_default_limit=with_default_limit)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 923, in 
perform_simple_statement
self.print_result(rows, with_default_limit, cfMetaData)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 935, in print_result
self.print_static_result(rows, cfMetaData)
  File "/home/automaton/fab/cassandra/bin/cqlsh", line 961, in 
print_static_result
colnames = rows[0]._fields
TypeError: 'PagedResult' object does not support indexing
{code}

Placing a limit on the query still works.



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


[jira] [Comment Edited] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie edited comment on CASSANDRA-7619 at 7/25/14 7:32 PM:
-

Spoke too soon regarding whitespace.  CR whitespace errors were suppressed on 
my testing box since I'd applied the whitespace change I linked above and 
promptly forgot about it.  There's no free lunch here - git's going to consider 
CR as trailing whitespace unless individuals configure it otherwise.


was (Author: joshuamckenzie):
Spoke too soon.  CR whitespace errors were suppressed on my testing box since 
I'd applied the whitespace change I linked above and promptly forgot about it.  
There's no free lunch here - git's going to consider CR as trailing whitespace 
unless individuals configure it otherwise.

Other than that, v3 should be good (assuming you don't have any trouble with it 
Ala').

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


[jira] [Commented] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie commented on CASSANDRA-7619:


Spoke too soon.  CR whitespace errors were suppressed on my testing box since 
I'd applied the whitespace change I linked above and promptly forgot about it.  
There's no free lunch here - git's going to consider CR as trailing whitespace 
unless individuals configure it otherwise.

Other than that, v3 should be good (assuming you don't have any trouble with it 
Ala').

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


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

2014-07-25 Thread Tyler Hobbs (JIRA)

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

Tyler Hobbs updated CASSANDRA-7601:
---

Reviewer: Tyler Hobbs

> Data loss after nodetool taketoken
> --
>
> Key: CASSANDRA-7601
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7601
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core, Tests
> Environment: Mac OSX Mavericks. Ubuntu 14.04
>Reporter: Philip Thompson
>Assignee: Brandon Williams
>Priority: Minor
> Fix For: 2.0.10, 2.1.0
>
> Attachments: 7601-2.0.txt, 7601-2.1.txt, 
> consistent_bootstrap_test.py, taketoken.tar.gz
>
>
> The dtest 
> consistent_bootstrap_test.py:TestBootstrapConsistency.consistent_reads_after_relocate_test
>  is failing on HEAD of the git branches 2.1 and 2.1.0.
> The test performs the following actions:
> - Create a cluster of 3 nodes
> - Create a keyspace with RF 2
> - Take node 3 down
> - Write 980 rows to node 2 with CL ONE
> - Flush node 2
> - Bring node 3 back up
> - Run nodetool taketoken on node 3 to transfer 80% of node 1's tokens to node 
> 3
> - Check for data loss
> When the check for data loss is performed, only ~725 rows can be read via CL 
> ALL.



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


[1/3] git commit: Set -Dcassandra.storagedir for all tool shell scripts

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk b5f8bd2af -> 6477fa95f


Set -Dcassandra.storagedir for all tool shell scripts

Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587


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

Branch: refs/heads/trunk
Commit: 83b3f1306140fec625c405fa263878eeefe1a728
Parents: 638c40e
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:26:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:26:18 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e0284b..d6dcfc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
v2 protocols (CASSANDRA-7617)
  * Fix tracing of range slices and secondary index lookups that are local
to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 47c6c88..53a529e 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -134,7 +134,8 @@ launch_service()
 props="$3"
 class="$4"
 cassandra_parms="-Dlogback.configurationFile=logback.xml"
-cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs 
-Dcassandra.storagedir=$CASSANDRA_HOME/data"
+cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
+cassandra_parms="$cassandra_parms 
-Dcassandra.storagedir=$cassandra_storagedir"
 
 if [ "x$pidpath" != "x" ]; then
 cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-cli
--
diff --git a/bin/cassandra-cli b/bin/cassandra-cli
index 80069d4..a2696da 100755
--- a/bin/cassandra-cli
+++ b/bin/cassandra-cli
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
+-Dcassandra.storagedir="$cassandra_storagedir" \
 -Dlogback.configurationFile=logback-tools.xml \
 org.apache.cassandra.cli.CliMain "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-shuffle
--
diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle
index 31975d4..10a409d 100755
--- a/bin/cassandra-shuffle
+++ b/bin/cassandra-shuffle
@@ -51,6 +51,7 @@ esac
 
 "$JAVA" -cp "$CLASSPATH" \
   -Xmx32m \
+  -Dcassandra.storagedir="$cassandra_storagedir" \
   -Dlogback.configurationFile=logback-tools.xml \
   org.apache.cassandra.tools.Shuffle $@
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra.in.sh
--
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 1212418..50e6eaf 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -30,6 +30,10 @@ cassandra_bin="$CASSANDRA_HOME/build/classes/main"
 cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$cassandra_home/build/cassandra.jar"
 
+# the default location for commitlogs, sstables, and saved caches
+# if not set in cassandra.yaml
+cassandra_storagedir="$CASSANDRA_HOME/data"
+
 # JAVA_HOME can optionally be set here
 #JAVA_HOME=/usr/local/jdk6
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/nodetool
--
diff --git a/bin/nodetool b/bin/no

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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 3fc8bb1edf4f6eddd3f92e6b6809a22d427dfd2e
Parents: b2c511e 83b3f13
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:27:12 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:27:12 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


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



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 3fc8bb1edf4f6eddd3f92e6b6809a22d427dfd2e
Parents: b2c511e 83b3f13
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:27:12 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:27:12 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


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



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6477fa95fe9580159cf1cb9bcf500e9c88b1a3b2
Parents: b5f8bd2 3fc8bb1
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:27:47 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:27:47 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6477fa95/bin/cassandra.in.sh
--
diff --cc bin/cassandra.in.sh
index 835c50c,50e6eaf..368c40e
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@@ -28,8 -28,12 +28,12 @@@ f
  # it's just used here in constructing the classpath.
  cassandra_bin="$CASSANDRA_HOME/build/classes/main"
  cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 -#cassandra_bin="$cassandra_home/build/cassandra.jar"
 +#cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar"
  
+ # the default location for commitlogs, sstables, and saved caches
+ # if not set in cassandra.yaml
+ cassandra_storagedir="$CASSANDRA_HOME/data"
+ 
  # JAVA_HOME can optionally be set here
  #JAVA_HOME=/usr/local/jdk6
  



[1/2] git commit: Set -Dcassandra.storagedir for all tool shell scripts

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b2c511eac -> 3fc8bb1ed


Set -Dcassandra.storagedir for all tool shell scripts

Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587


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

Branch: refs/heads/cassandra-2.1
Commit: 83b3f1306140fec625c405fa263878eeefe1a728
Parents: 638c40e
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:26:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:26:18 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e0284b..d6dcfc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
v2 protocols (CASSANDRA-7617)
  * Fix tracing of range slices and secondary index lookups that are local
to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 47c6c88..53a529e 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -134,7 +134,8 @@ launch_service()
 props="$3"
 class="$4"
 cassandra_parms="-Dlogback.configurationFile=logback.xml"
-cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs 
-Dcassandra.storagedir=$CASSANDRA_HOME/data"
+cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
+cassandra_parms="$cassandra_parms 
-Dcassandra.storagedir=$cassandra_storagedir"
 
 if [ "x$pidpath" != "x" ]; then
 cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-cli
--
diff --git a/bin/cassandra-cli b/bin/cassandra-cli
index 80069d4..a2696da 100755
--- a/bin/cassandra-cli
+++ b/bin/cassandra-cli
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
+-Dcassandra.storagedir="$cassandra_storagedir" \
 -Dlogback.configurationFile=logback-tools.xml \
 org.apache.cassandra.cli.CliMain "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-shuffle
--
diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle
index 31975d4..10a409d 100755
--- a/bin/cassandra-shuffle
+++ b/bin/cassandra-shuffle
@@ -51,6 +51,7 @@ esac
 
 "$JAVA" -cp "$CLASSPATH" \
   -Xmx32m \
+  -Dcassandra.storagedir="$cassandra_storagedir" \
   -Dlogback.configurationFile=logback-tools.xml \
   org.apache.cassandra.tools.Shuffle $@
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra.in.sh
--
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 1212418..50e6eaf 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -30,6 +30,10 @@ cassandra_bin="$CASSANDRA_HOME/build/classes/main"
 cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$cassandra_home/build/cassandra.jar"
 
+# the default location for commitlogs, sstables, and saved caches
+# if not set in cassandra.yaml
+cassandra_storagedir="$CASSANDRA_HOME/data"
+
 # JAVA_HOME can optionally be set here
 #JAVA_HOME=/usr/local/jdk6
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/nodetool
--
diff --git a/bin/n

git commit: Set -Dcassandra.storagedir for all tool shell scripts

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 638c40e81 -> 83b3f1306


Set -Dcassandra.storagedir for all tool shell scripts

Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587


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

Branch: refs/heads/cassandra-2.1.0
Commit: 83b3f1306140fec625c405fa263878eeefe1a728
Parents: 638c40e
Author: Tyler Hobbs 
Authored: Fri Jul 25 14:26:18 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 14:26:18 2014 -0500

--
 CHANGES.txt  | 1 +
 bin/cassandra| 3 ++-
 bin/cassandra-cli| 1 +
 bin/cassandra-shuffle| 1 +
 bin/cassandra.in.sh  | 4 
 bin/nodetool | 1 +
 bin/sstablekeys  | 1 +
 bin/sstableloader| 1 +
 bin/sstablescrub | 1 +
 bin/sstableupgrade   | 1 +
 tools/bin/cassandra-stress   | 4 +++-
 tools/bin/cassandra-stressd  | 4 +++-
 tools/bin/cassandra.in.sh| 4 
 tools/bin/json2sstable   | 1 +
 tools/bin/sstable2json   | 1 +
 tools/bin/sstablelevelreset  | 1 +
 tools/bin/sstablemetadata| 1 +
 tools/bin/sstablerepairedset | 1 +
 tools/bin/sstablesplit   | 1 +
 19 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e0284b..d6dcfc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
v2 protocols (CASSANDRA-7617)
  * Fix tracing of range slices and secondary index lookups that are local
to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 47c6c88..53a529e 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -134,7 +134,8 @@ launch_service()
 props="$3"
 class="$4"
 cassandra_parms="-Dlogback.configurationFile=logback.xml"
-cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs 
-Dcassandra.storagedir=$CASSANDRA_HOME/data"
+cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
+cassandra_parms="$cassandra_parms 
-Dcassandra.storagedir=$cassandra_storagedir"
 
 if [ "x$pidpath" != "x" ]; then
 cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-cli
--
diff --git a/bin/cassandra-cli b/bin/cassandra-cli
index 80069d4..a2696da 100755
--- a/bin/cassandra-cli
+++ b/bin/cassandra-cli
@@ -44,6 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
+-Dcassandra.storagedir="$cassandra_storagedir" \
 -Dlogback.configurationFile=logback-tools.xml \
 org.apache.cassandra.cli.CliMain "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra-shuffle
--
diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle
index 31975d4..10a409d 100755
--- a/bin/cassandra-shuffle
+++ b/bin/cassandra-shuffle
@@ -51,6 +51,7 @@ esac
 
 "$JAVA" -cp "$CLASSPATH" \
   -Xmx32m \
+  -Dcassandra.storagedir="$cassandra_storagedir" \
   -Dlogback.configurationFile=logback-tools.xml \
   org.apache.cassandra.tools.Shuffle $@
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/cassandra.in.sh
--
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 1212418..50e6eaf 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -30,6 +30,10 @@ cassandra_bin="$CASSANDRA_HOME/build/classes/main"
 cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$cassandra_home/build/cassandra.jar"
 
+# the default location for commitlogs, sstables, and saved caches
+# if not set in cassandra.yaml
+cassandra_storagedir="$CASSANDRA_HOME/data"
+
 # JAVA_HOME can optionally be set here
 #JAVA_HOME=/usr/local/jdk6
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83b3f130/bin/nodetool
--
diff --git a/b

[jira] [Commented] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Ala' Alkhaldi (JIRA)

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

Ala' Alkhaldi commented on CASSANDRA-7619:
--

LGTM. +1

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


[jira] [Comment Edited] (CASSANDRA-7386) JBOD threshold to prevent unbalanced disk utilization

2014-07-25 Thread Yuki Morishita (JIRA)

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

Yuki Morishita edited comment on CASSANDRA-7386 at 7/25/14 6:59 PM:


[~lyubent] I have [branch|https://github.com/yukim/cassandra/tree/7386] that 
writes WriteValues to csv for analysis. Feel free to use it.


was (Author: yukim):
[~lyubent] I have [branch](https://github.com/yukim/cassandra/tree/7386) that 
writes WriteValues to csv for analysis. Feel free to use it.

> JBOD threshold to prevent unbalanced disk utilization
> -
>
> Key: CASSANDRA-7386
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7386
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Chris Lohfink
>Assignee: Lyuben Todorov
>Priority: Minor
> Fix For: 2.1.1
>
> Attachments: 7386-v1.patch, 7386v2.diff, Mappe1.ods, 
> patch_2_1_branch_proto.diff
>
>
> Currently the pick the disks are picked first by number of current tasks, 
> then by free space.  This helps with performance but can lead to large 
> differences in utilization in some (unlikely but possible) scenarios.  Ive 
> seen 55% to 10% and heard reports of 90% to 10% on IRC.  With both LCS and 
> STCS (although my suspicion is that STCS makes it worse since harder to be 
> balanced).
> I purpose the algorithm change a little to have some maximum range of 
> utilization where it will pick by free space over load (acknowledging it can 
> be slower).  So if a disk A is 30% full and disk B is 5% full it will never 
> pick A over B until it balances out.



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


[jira] [Commented] (CASSANDRA-7386) JBOD threshold to prevent unbalanced disk utilization

2014-07-25 Thread Yuki Morishita (JIRA)

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

Yuki Morishita commented on CASSANDRA-7386:
---

[~lyubent] I have [branch](https://github.com/yukim/cassandra/tree/7386) that 
writes WriteValues to csv for analysis. Feel free to use it.

> JBOD threshold to prevent unbalanced disk utilization
> -
>
> Key: CASSANDRA-7386
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7386
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Chris Lohfink
>Assignee: Lyuben Todorov
>Priority: Minor
> Fix For: 2.1.1
>
> Attachments: 7386-v1.patch, 7386v2.diff, Mappe1.ods, 
> patch_2_1_branch_proto.diff
>
>
> Currently the pick the disks are picked first by number of current tasks, 
> then by free space.  This helps with performance but can lead to large 
> differences in utilization in some (unlikely but possible) scenarios.  Ive 
> seen 55% to 10% and heard reports of 90% to 10% on IRC.  With both LCS and 
> STCS (although my suspicion is that STCS makes it worse since harder to be 
> balanced).
> I purpose the algorithm change a little to have some maximum range of 
> utilization where it will pick by free space over load (acknowledging it can 
> be slower).  So if a disk A is 30% full and disk B is 5% full it will never 
> pick A over B until it balances out.



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


[jira] [Resolved] (CASSANDRA-7574) Support Custom Predicate in CQL SELECT for Custom Secondary Index

2014-07-25 Thread Brandon Williams (JIRA)

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

Brandon Williams resolved CASSANDRA-7574.
-

Resolution: Duplicate

>  Support Custom Predicate in CQL SELECT for Custom Secondary Index
> --
>
> Key: CASSANDRA-7574
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7574
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Yeshvanthni
>Priority: Minor
>
> The SELECT query validation limits the predicates the custom secondary index 
> can support.
> Possible Approaches:
> -Introduction of a special predicate string like custom_predicate which 
> by-passes validation
> CREATE CUSTOM INDEX ON table(column)  USING 
> 'org.example.CustomSecondaryIndex';
> Select * from table where custom_predicate=" 
> something_only_custom_class_understands"
> This might open up possibilities like,
> - Range queries on secondary indexed columns etc
> - Wild cards



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


[jira] [Commented] (CASSANDRA-7574) Support Custom Predicate in CQL SELECT for Custom Secondary Index

2014-07-25 Thread Yeshvanthni (JIRA)

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

Yeshvanthni commented on CASSANDRA-7574:


Yes. You may close this as duplicate. 
https://issues.apache.org/jira/browse/CASSANDRA-7575 was not open yet when this 
request was made.

>  Support Custom Predicate in CQL SELECT for Custom Secondary Index
> --
>
> Key: CASSANDRA-7574
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7574
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Yeshvanthni
>Priority: Minor
>
> The SELECT query validation limits the predicates the custom secondary index 
> can support.
> Possible Approaches:
> -Introduction of a special predicate string like custom_predicate which 
> by-passes validation
> CREATE CUSTOM INDEX ON table(column)  USING 
> 'org.example.CustomSecondaryIndex';
> Select * from table where custom_predicate=" 
> something_only_custom_class_understands"
> This might open up possibilities like,
> - Range queries on secondary indexed columns etc
> - Wild cards



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


[1/3] git commit: Fix tracing of local portions of range slices

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk a09f36354 -> b5f8bd2af


Fix tracing of local portions of range slices

Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599


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

Branch: refs/heads/trunk
Commit: 638c40e817a0d4c4e52956491b99c2699bedc80c
Parents: 9082281
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:25:35 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:25:35 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1278c56..4e0284b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
  * Use "keyspace updated" schema change message for UDT changes in v1 and
v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+   to the coordinator (CASSANDRA-7599)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 9eae17a..65ce413 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1405,7 +1405,7 @@ public class StorageProxy implements StorageProxyMBean
 
 LocalRangeSliceRunnable(AbstractRangeCommand command, 
ReadCallback> handler)
 {
-super(MessagingService.Verb.READ);
+super(MessagingService.Verb.RANGE_SLICE);
 this.command = command;
 this.handler = handler;
 }
@@ -1590,7 +1590,7 @@ public class StorageProxy implements StorageProxyMBean
 && 
filteredEndpoints.get(0).equals(FBUtilities.getBroadcastAddress())
 && OPTIMIZE_LOCAL_REQUESTS)
 {
-StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler));
+StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler), Tracing.instance.get());
 }
 else
 {



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: b2c511eacb43f1558ca21a46bfc560fc6c2f
Parents: 831dd12 638c40e
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:26:41 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:26:41 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2c511ea/src/java/org/apache/cassandra/service/StorageProxy.java
--



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b5f8bd2afc7d5e627fd4294b15fbaed34580eb49
Parents: a09f363 b2c511e
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:27:00 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:27:00 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


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



[1/2] git commit: Fix tracing of local portions of range slices

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 831dd124f -> b2c511eac


Fix tracing of local portions of range slices

Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599


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

Branch: refs/heads/cassandra-2.1
Commit: 638c40e817a0d4c4e52956491b99c2699bedc80c
Parents: 9082281
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:25:35 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:25:35 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1278c56..4e0284b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
  * Use "keyspace updated" schema change message for UDT changes in v1 and
v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+   to the coordinator (CASSANDRA-7599)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 9eae17a..65ce413 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1405,7 +1405,7 @@ public class StorageProxy implements StorageProxyMBean
 
 LocalRangeSliceRunnable(AbstractRangeCommand command, 
ReadCallback> handler)
 {
-super(MessagingService.Verb.READ);
+super(MessagingService.Verb.RANGE_SLICE);
 this.command = command;
 this.handler = handler;
 }
@@ -1590,7 +1590,7 @@ public class StorageProxy implements StorageProxyMBean
 && 
filteredEndpoints.get(0).equals(FBUtilities.getBroadcastAddress())
 && OPTIMIZE_LOCAL_REQUESTS)
 {
-StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler));
+StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler), Tracing.instance.get());
 }
 else
 {



git commit: Fix tracing of local portions of range slices

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 908228192 -> 638c40e81


Fix tracing of local portions of range slices

Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599


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

Branch: refs/heads/cassandra-2.1.0
Commit: 638c40e817a0d4c4e52956491b99c2699bedc80c
Parents: 9082281
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:25:35 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:25:35 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1278c56..4e0284b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
  * Use "keyspace updated" schema change message for UDT changes in v1 and
v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+   to the coordinator (CASSANDRA-7599)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/638c40e8/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 9eae17a..65ce413 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1405,7 +1405,7 @@ public class StorageProxy implements StorageProxyMBean
 
 LocalRangeSliceRunnable(AbstractRangeCommand command, 
ReadCallback> handler)
 {
-super(MessagingService.Verb.READ);
+super(MessagingService.Verb.RANGE_SLICE);
 this.command = command;
 this.handler = handler;
 }
@@ -1590,7 +1590,7 @@ public class StorageProxy implements StorageProxyMBean
 && 
filteredEndpoints.get(0).equals(FBUtilities.getBroadcastAddress())
 && OPTIMIZE_LOCAL_REQUESTS)
 {
-StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler));
+StageManager.getStage(Stage.READ).execute(new 
LocalRangeSliceRunnable(nodeCmd, handler), Tracing.instance.get());
 }
 else
 {



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: b2c511eacb43f1558ca21a46bfc560fc6c2f
Parents: 831dd12 638c40e
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:26:41 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:26:41 2014 -0500

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2c511ea/src/java/org/apache/cassandra/service/StorageProxy.java
--



[jira] [Comment Edited] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie edited comment on CASSANDRA-7619 at 7/25/14 6:15 PM:
-

Looks like v2 lost the 2 cassandra.in.bat files.  Attaching a fixed v3 that 
also adds the call to cassandra.in.bat inside debug-cql.bat (instead of just 
the pushd added in v2).

Also - I've ditched cygwin entirely at this point in my local environment.  As 
you mentioned offline Ala', git-scm looks like it handles CR on diff creation 
correctly whereas cygwin git is... cygwin git.  v3 should apply without 
whitespace errors.


was (Author: joshuamckenzie):
Looks like v2 lost the 2 cassandra.in.bat files.  Attaching a fixed v3 that 
also adds the call to cassandra.in.bat (instead of just the pushd added in v2).

Also - I've ditched cygwin entirely at this point in my local environment.  As 
you mentioned offline Ala', git-scm looks like it handles CR on diff creation 
correctly whereas cygwin git is... cygwin git.  v3 should apply without 
whitespace errors.

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 831dd124f51531b365bf038eb98dff08dea0cce4
Parents: b2a37c7 9082281
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:16:07 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:16:07 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


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



[1/3] git commit: Use "keyspace updated" message for UDT changes in v1/2 protocols

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk 01d51d5a3 -> a09f36354


Use "keyspace updated" message for UDT changes in v1/2 protocols

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7617


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

Branch: refs/heads/trunk
Commit: 90822819290d9df8143d08e3869141beffd15695
Parents: 5544ecb
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:14:27 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:15:40 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e940931..1278c56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+   v2 protocols (CASSANDRA-7617)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v1.spec
--
diff --git a/doc/native_protocol_v1.spec b/doc/native_protocol_v1.spec
index 08cb91e..83154fc 100644
--- a/doc/native_protocol_v1.spec
+++ b/doc/native_protocol_v1.spec
@@ -472,8 +472,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -499,6 +501,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v2.spec
--
diff --git a/doc/native_protocol_v2.spec b/doc/native_protocol_v2.spec
index 11d380f..0f0cbcb 100644
--- a/doc/native_protocol_v2.spec
+++ b/doc/native_protocol_v2.spec
@@ -590,8 +590,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -617,6 +619,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/src/java/org/apache/cassandra/transport/Event.java
--
diff --git a/src/java/org/apache/cassandra/transport/Event.java 
b/src/java/org/apache/cassandra/transport/Event.java
index 1b7e487..b7c5e68 100644
--- a/src/java/org/apache/cass

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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a09f36354019d7e53881872ed4dac5b961092905
Parents: 01d51d5 831dd12
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:16:31 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:16:31 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


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



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 831dd124f51531b365bf038eb98dff08dea0cce4
Parents: b2a37c7 9082281
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:16:07 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:16:07 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


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



[1/2] git commit: Use "keyspace updated" message for UDT changes in v1/2 protocols

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b2a37c798 -> 831dd124f


Use "keyspace updated" message for UDT changes in v1/2 protocols

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7617


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

Branch: refs/heads/cassandra-2.1
Commit: 90822819290d9df8143d08e3869141beffd15695
Parents: 5544ecb
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:14:27 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:15:40 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e940931..1278c56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+   v2 protocols (CASSANDRA-7617)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v1.spec
--
diff --git a/doc/native_protocol_v1.spec b/doc/native_protocol_v1.spec
index 08cb91e..83154fc 100644
--- a/doc/native_protocol_v1.spec
+++ b/doc/native_protocol_v1.spec
@@ -472,8 +472,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -499,6 +501,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v2.spec
--
diff --git a/doc/native_protocol_v2.spec b/doc/native_protocol_v2.spec
index 11d380f..0f0cbcb 100644
--- a/doc/native_protocol_v2.spec
+++ b/doc/native_protocol_v2.spec
@@ -590,8 +590,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -617,6 +619,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/src/java/org/apache/cassandra/transport/Event.java
--
diff --git a/src/java/org/apache/cassandra/transport/Event.java 
b/src/java/org/apache/cassandra/transport/Event.java
index 1b7e487..b7c5e68 100644
--- a/src/java

git commit: Use "keyspace updated" message for UDT changes in v1/2 protocols

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 5544ecbf6 -> 908228192


Use "keyspace updated" message for UDT changes in v1/2 protocols

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7617


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

Branch: refs/heads/cassandra-2.1.0
Commit: 90822819290d9df8143d08e3869141beffd15695
Parents: 5544ecb
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:14:27 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:15:40 2014 -0500

--
 CHANGES.txt |  2 ++
 doc/native_protocol_v1.spec |  9 ++--
 doc/native_protocol_v2.spec |  9 ++--
 .../org/apache/cassandra/transport/Event.java   | 23 +---
 4 files changed, 36 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e940931..1278c56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
  * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+   v2 protocols (CASSANDRA-7617)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v1.spec
--
diff --git a/doc/native_protocol_v1.spec b/doc/native_protocol_v1.spec
index 08cb91e..83154fc 100644
--- a/doc/native_protocol_v1.spec
+++ b/doc/native_protocol_v1.spec
@@ -472,8 +472,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -499,6 +501,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/doc/native_protocol_v2.spec
--
diff --git a/doc/native_protocol_v2.spec b/doc/native_protocol_v2.spec
index 11d380f..0f0cbcb 100644
--- a/doc/native_protocol_v2.spec
+++ b/doc/native_protocol_v2.spec
@@ -590,8 +590,10 @@ Table of Contents
   the empty string "") if the change was affecting a keyspace and not a
   table.
 
-  Note that queries to create and drop an index are considered as change
-  updating the table the index is on.
+  Note that queries to create and drop an index are considered changes
+  updating the table the index is on.  Queries that create, alter, or drop
+  user-defined types (availble in Cassandra 2.1+) are considered changes
+  updating the keyspace the type is defined in.
 
 
 4.2.6. EVENT
@@ -617,6 +619,9 @@ Table of Contents
   followed by the name of the affected keyspace and the name of the
   affected table within that keyspace. For changes that affect a keyspace
   directly, the table name will be empty (i.e. the empty string "").
+  Changes to user-defined types (available in Cassandra 2.1+) will result
+  in an "UPDATED" change for the keyspace containing the type, and the
+  table name will be empty.
 
   All EVENT message have a streamId of -1 (Section 2.3).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90822819/src/java/org/apache/cassandra/transport/Event.java
--
diff --git a/src/java/org/apache/cassandra/transport/Event.java 
b/src/java/org/apache/cassandra/transport/Event.java
index 1b7e487..b7c5e68 100644
--- a/src/

[jira] [Updated] (CASSANDRA-7619) Normalize windows tool batch file environments

2014-07-25 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie updated CASSANDRA-7619:
---

Attachment: 7619_v3.txt

Looks like v2 lost the 2 cassandra.in.bat files.  Attaching a fixed v3 that 
also adds the call to cassandra.in.bat (instead of just the pushd added in v2).

Also - I've ditched cygwin entirely at this point in my local environment.  As 
you mentioned offline Ala', git-scm looks like it handles CR on diff creation 
correctly whereas cygwin git is... cygwin git.  v3 should apply without 
whitespace errors.

> Normalize windows tool batch file environments
> --
>
> Key: CASSANDRA-7619
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7619
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Joshua McKenzie
>Assignee: Joshua McKenzie
>Priority: Minor
>  Labels: Windows
> Fix For: 2.1.0
>
> Attachments: 7619_v1.txt, 7619_v2.txt, 7619_v3.txt
>
>
> Reference CASSANDRA-7587.  We don't currently have something analogous to 
> cassandra.in.sh for Windows so there's no single point of insertion to add 
> something to the environment for those tools to run.  Along with that, 
> there's a bunch of duplicated code in those .bat files to determine 
> classpath, home dir, etc.



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


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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1.0
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:08 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 01d51d5a3b50d62dcc647b45ce68c08a61c6d57b
Parents: 4598349 b2a37c7
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:28 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:28 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/trunk
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:08 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: b2a37c798920e646629a0c3c772b1cedd6e08ee5
Parents: 192f693 5544ecb
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:18 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:18 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:08 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




[04/10] git commit: update CL archive comments post-6905

2014-07-25 Thread brandonwilliams
update CL archive comments post-6905


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

Branch: refs/heads/trunk
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams 
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:10:54 2014 -0500

--
 conf/commitlog_archiving.properties | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
--
diff --git a/conf/commitlog_archiving.properties 
b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
 # Restore mutations created up to and including this timestamp in GMT.
 # Format: :MM:dd HH:mm:ss (2012:04:31 20:43:12)
 #
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered.  Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
 restore_point_in_time=
 
 # precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, 
...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS



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

2014-07-25 Thread brandonwilliams
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: b2a37c798920e646629a0c3c772b1cedd6e08ee5
Parents: 192f693 5544ecb
Author: Brandon Williams 
Authored: Fri Jul 25 13:11:18 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:11:18 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




[01/10] git commit: update CL archive comments post-6905

2014-07-25 Thread brandonwilliams
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 60e56d4be -> f5e634c1c
  refs/heads/cassandra-2.1 192f693b5 -> b2a37c798
  refs/heads/cassandra-2.1.0 5001b382e -> 5544ecbf6
  refs/heads/trunk 45983497f -> 01d51d5a3


update CL archive comments post-6905


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

Branch: refs/heads/cassandra-2.0
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams 
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:10:54 2014 -0500

--
 conf/commitlog_archiving.properties | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
--
diff --git a/conf/commitlog_archiving.properties 
b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
 # Restore mutations created up to and including this timestamp in GMT.
 # Format: :MM:dd HH:mm:ss (2012:04:31 20:43:12)
 #
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered.  Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
 restore_point_in_time=
 
 # precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, 
...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS



[03/10] git commit: update CL archive comments post-6905

2014-07-25 Thread brandonwilliams
update CL archive comments post-6905


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

Branch: refs/heads/cassandra-2.1
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams 
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:10:54 2014 -0500

--
 conf/commitlog_archiving.properties | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
--
diff --git a/conf/commitlog_archiving.properties 
b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
 # Restore mutations created up to and including this timestamp in GMT.
 # Format: :MM:dd HH:mm:ss (2012:04:31 20:43:12)
 #
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered.  Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
 restore_point_in_time=
 
 # precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, 
...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS



[02/10] git commit: update CL archive comments post-6905

2014-07-25 Thread brandonwilliams
update CL archive comments post-6905


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

Branch: refs/heads/cassandra-2.1.0
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams 
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams 
Committed: Fri Jul 25 13:10:54 2014 -0500

--
 conf/commitlog_archiving.properties | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
--
diff --git a/conf/commitlog_archiving.properties 
b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
 # Restore mutations created up to and including this timestamp in GMT.
 # Format: :MM:dd HH:mm:ss (2012:04:31 20:43:12)
 #
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered.  Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
 restore_point_in_time=
 
 # precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, 
...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS



[jira] [Commented] (CASSANDRA-7599) Dtest on low cardinality secondary indexes failing in 2.1

2014-07-25 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7599:
-

+1

> Dtest on low cardinality secondary indexes failing in 2.1
> -
>
> Key: CASSANDRA-7599
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7599
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core, Tests
>Reporter: Shawn Kumar
>Assignee: Tyler Hobbs
> Fix For: 2.1.0
>
> Attachments: 7599.txt
>
>
> test_low_cardinality_indexes in secondary_indexes_test.py is failing when 
> tested on the cassandra-2.1 branch. This test has been failing on cassci for 
> a while (at least the last 10 builds) and can easily be reproduced locally as 
> well. It appears to still work on 2.0.
> {code}
> ==
> FAIL: test_low_cardinality_indexes 
> (secondary_indexes_test.TestSecondaryIndexes)
> --
> Traceback (most recent call last):
>   File "/home/shawn/git/cstar5/cassandra-dtest/tools.py", line 213, in wrapped
> f(obj)
>   File "/home/shawn/git/cstar5/cassandra-dtest/secondary_indexes_test.py", 
> line 89, in test_low_cardinality_indexes
> check_request_order()
>   File "/home/shawn/git/cstar5/cassandra-dtest/secondary_indexes_test.py", 
> line 84, in check_request_order
> self.assertTrue('Executing indexed scan' in relevant_events[-1][0], 
> str(relevant_events[-1]))
> AssertionError: (u'Enqueuing request to /127.0.0.2', '127.0.0.1')
> {code}
> The test checks that a series of messages are found in the trace after a 
> select query against an index is carried out. It fails to find an 'Executing 
> indexed scan' from node 1 (which takes the query, note both node2 and node3 
> produced this message). Brief investigation seemed to show that whichever 
> node you create the patient_cql_connection on will not produce this message, 
> indicating perhaps it does not carry out the scan.  Should also note that 
> changing 'numrows' (rows initially added) or 'b' (value on index column we 
> query for) does not appear to make a difference.



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


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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 192f693b5cedd35273f316ed98b9385c23804d0c
Parents: f03e505 5001b38
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:05:46 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:05:46 2014 -0500

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


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

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



[1/3] git commit: Fix cqlsh deserialization of blobs

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/trunk 9b4bc73ad -> 45983497f


Fix cqlsh deserialization of blobs

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603


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

Branch: refs/heads/trunk
Commit: 5001b382ed7a1c9696830336ac84cb5ffaf20037
Parents: 5571569
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:05:02 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:05:02 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7a26fa6..e940931 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,12 @@
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)
- * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
  * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
  * Fix NPE when dropping index from non-existent keyspace, AssertionError when
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index fb6fb5f..2d83034 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -548,8 +548,8 @@ class Shell(cmd.Cmd):
 self.stdin = stdin
 self.query_out = sys.stdout
 self.consistency_level = cassandra.ConsistencyLevel.ONE
-#Python driver returns BLOBs as string, but we expect them as buffer()
-cassandra.cqltypes.BytesType.deserialize = 
staticmethod(cassandra.cqltypes.BytesType.validate)
+# the python driver returns BLOBs as string, but we expect them as 
bytearrays
+cassandra.cqltypes.BytesType.deserialize = staticmethod(lambda byts, 
protocol_version: bytearray(byts))
 cassandra.cqltypes.CassandraType.support_empty_values = True
 
 auto_format_udts()



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 45983497fdd65bd11a073d354a105de96aff4d44
Parents: 9b4bc73 192f693
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:06:45 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:06:45 2014 -0500

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


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



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

2014-07-25 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 192f693b5cedd35273f316ed98b9385c23804d0c
Parents: f03e505 5001b38
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:05:46 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:05:46 2014 -0500

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


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

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



[1/2] git commit: Fix cqlsh deserialization of blobs

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f03e505fd -> 192f693b5


Fix cqlsh deserialization of blobs

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603


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

Branch: refs/heads/cassandra-2.1
Commit: 5001b382ed7a1c9696830336ac84cb5ffaf20037
Parents: 5571569
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:05:02 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:05:02 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7a26fa6..e940931 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,12 @@
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)
- * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
  * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
  * Fix NPE when dropping index from non-existent keyspace, AssertionError when
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index fb6fb5f..2d83034 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -548,8 +548,8 @@ class Shell(cmd.Cmd):
 self.stdin = stdin
 self.query_out = sys.stdout
 self.consistency_level = cassandra.ConsistencyLevel.ONE
-#Python driver returns BLOBs as string, but we expect them as buffer()
-cassandra.cqltypes.BytesType.deserialize = 
staticmethod(cassandra.cqltypes.BytesType.validate)
+# the python driver returns BLOBs as string, but we expect them as 
bytearrays
+cassandra.cqltypes.BytesType.deserialize = staticmethod(lambda byts, 
protocol_version: bytearray(byts))
 cassandra.cqltypes.CassandraType.support_empty_values = True
 
 auto_format_udts()



git commit: Fix cqlsh deserialization of blobs

2014-07-25 Thread tylerhobbs
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 557156914 -> 5001b382e


Fix cqlsh deserialization of blobs

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603


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

Branch: refs/heads/cassandra-2.1.0
Commit: 5001b382ed7a1c9696830336ac84cb5ffaf20037
Parents: 5571569
Author: Tyler Hobbs 
Authored: Fri Jul 25 13:05:02 2014 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 25 13:05:02 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7a26fa6..e940931 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,12 @@
  * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)
- * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
  * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
  * Fix NPE when dropping index from non-existent keyspace, AssertionError when
dropping non-existent index with IF EXISTS (CASSANDRA-7590)
  * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5001b382/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index fb6fb5f..2d83034 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -548,8 +548,8 @@ class Shell(cmd.Cmd):
 self.stdin = stdin
 self.query_out = sys.stdout
 self.consistency_level = cassandra.ConsistencyLevel.ONE
-#Python driver returns BLOBs as string, but we expect them as buffer()
-cassandra.cqltypes.BytesType.deserialize = 
staticmethod(cassandra.cqltypes.BytesType.validate)
+# the python driver returns BLOBs as string, but we expect them as 
bytearrays
+cassandra.cqltypes.BytesType.deserialize = staticmethod(lambda byts, 
protocol_version: bytearray(byts))
 cassandra.cqltypes.CassandraType.support_empty_values = True
 
 auto_format_udts()



[jira] [Commented] (CASSANDRA-7574) Support Custom Predicate in CQL SELECT for Custom Secondary Index

2014-07-25 Thread Robert Stupp (JIRA)

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

Robert Stupp commented on CASSANDRA-7574:
-

isn't this similar to CASSANDRA-7575 ?

>  Support Custom Predicate in CQL SELECT for Custom Secondary Index
> --
>
> Key: CASSANDRA-7574
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7574
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Yeshvanthni
>Priority: Minor
>
> The SELECT query validation limits the predicates the custom secondary index 
> can support.
> Possible Approaches:
> -Introduction of a special predicate string like custom_predicate which 
> by-passes validation
> CREATE CUSTOM INDEX ON table(column)  USING 
> 'org.example.CustomSecondaryIndex';
> Select * from table where custom_predicate=" 
> something_only_custom_class_understands"
> This might open up possibilities like,
> - Range queries on secondary indexed columns etc
> - Wild cards



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


[jira] [Commented] (CASSANDRA-7560) 'nodetool repair -pr' leads to indefinitely hanging AntiEntropySession

2014-07-25 Thread Vladimir Avram (JIRA)

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

Vladimir Avram commented on CASSANDRA-7560:
---

Thanks, I will try the patch out on 2.0.7

> 'nodetool repair -pr' leads to indefinitely hanging AntiEntropySession
> --
>
> Key: CASSANDRA-7560
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7560
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Vladimir Avram
>Assignee: Yuki Morishita
> Fix For: 2.0.10
>
> Attachments: 0001-backport-CASSANDRA-6747.patch, 
> cassandra_daemon.log, cassandra_daemon_rep1.log, cassandra_daemon_rep2.log, 
> nodetool_command.log
>
>
> Running {{nodetool repair -pr}} will sometimes hang on one of the resulting 
> AntiEntropySessions.
> The system logs will show the repair command starting
> {noformat}
>  INFO [Thread-3079] 2014-07-15 02:22:56,514 StorageService.java (line 2569) 
> Starting repair command #1, repairing 256 ranges for keyspace x
> {noformat}
> You can then see a few AntiEntropySessions completing with:
> {noformat}
> INFO [AntiEntropySessions:2] 2014-07-15 02:28:12,766 RepairSession.java (line 
> 282) [repair #eefb3c30-0bc6-11e4-83f7-a378978d0c49] session completed 
> successfully
> {noformat}
> Finally we reach an AntiEntropySession at some point that hangs just before 
> requesting the merkle trees for the next column family in line for repair. So 
> we first see the previous CF being finished and the whole repair sessions 
> hangs here with no visible progress or errors on this or any of the related 
> nodes.
> {noformat}
> INFO [AntiEntropyStage:1] 2014-07-15 02:38:20,325 RepairSession.java (line 
> 221) [repair #8f85c1b0-0bc8-11e4-83f7-a378978d0c49] previous_cf is fully 
> synced
> {noformat}
> Notes:
> * Single DC 6 node cluster with an average load of 86 GB per node.
> * This appears to be random; it does not always happen on the same CF or on 
> the same session.



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


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

2014-07-25 Thread Robert Stupp (JIRA)

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

Robert Stupp commented on CASSANDRA-7575:
-

The custom column solution is a bit dirty by that you query column 'foo' for 
something that is in column 'bar'.
I think we can add support for 2i in UDFs (as an extension to UDFs - not with 
the basics covered by CASSANDRA-7395) - maybe by providing some information 
like table/row/column meta data to the UDF information.
UDFs could also help to cover "complex" queries against 
lucene/solr/elasticsearch (conditional filter/query against multiple fields, 
highlighting, etc). For example with something like this to get every row with 
a full-text-search score > .75. But that's stuff for a separate ticket - the 
UDF impl would then return a set of primary keys - so it's a "query rewrite" 
behind the scenes. But the syntax is much more obvious.
{noformat}
SELECT * FROM my_super_table WHERE elasticsearch('{
filter: {
type: "range",
field: "company",
lower: "a",
upper: "p"
},
sort:{
   fields: [{field:"name",reverse:true}]
}
}') > 0.75
{noformat}


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



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


[jira] [Updated] (CASSANDRA-7559) Switch Stress from using math3.pair because it is unserializable

2014-07-25 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7559:


Reviewer: Benedict

> Switch Stress from using math3.pair because it is unserializable 
> -
>
> Key: CASSANDRA-7559
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7559
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Russell Alexander Spitzer
>Assignee: Russell Alexander Spitzer
> Attachments: CASSANDRA-7559-2.1.patch
>
>
> Stress uses org.apache.commons.math3.util.Pair to hold information in 
> settings because eventually it is used in commons.math3.distributions. This 
> makes the settings unserializable so we can't run with StressDemon.
> {code}
> /bin/cassandra-stress user no_warmup "ops(insert=1)" n=1 
> profile=cqlstress-example.yaml -sendto 127.0.0.1
> Exception in thread "main" java.io.NotSerializableException: 
> org.apache.commons.math3.util.Pair
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1183)
>   at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:347)
> at java.util.ArrayList.writeObject(ArrayList.java:742)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>   at 
> java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:988)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1495)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at 
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1547)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1508)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at 
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1547)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1508)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:347)
>   at org.apache.cassandra.stress.Stress.main(Stress.java:78)
> Control-C caught. Canceling running action and shutting down...
> {code}
> To fix this we can pass around serializable pairs and convert to 
> commons.math3 pairs before we actually pass the objects to the distribution 
> code. 



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


[jira] [Updated] (CASSANDRA-7608) StressD can't create keyspaces with Write Command

2014-07-25 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7608:


Reviewer: Benedict

> StressD can't create keyspaces with Write Command
> -
>
> Key: CASSANDRA-7608
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7608
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Russell Alexander Spitzer
>Assignee: Russell Alexander Spitzer
>Priority: Minor
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-7608-2.1.patch
>
>
> It is impossible to run the default stress command via the dameon ./stress 
> write
> Because the column names are HeapByteBuffers so they get ignored during 
> serilization (no error is thrown) and then when the object is deserialized on 
> the server the settings.columns.names is null. This leads to a null pointer 
> on the dameon for what would have worked had it run locally.
> Settings object on the Local machine
> {code}
> columns = {org.apache.cassandra.stress.settings.SettingsColumn@1465}
> maxColumnsPerKey = 5
> names = {java.util.Arrays$ArrayList@1471} size = 5
> [0] = {java.nio.HeapByteBuffer@1478}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [1] = {java.nio.HeapByteBuffer@1483}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [2] = {java.nio.HeapByteBuffer@1484}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [3] = {java.nio.HeapByteBuffer@1485}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [4] = {java.nio.HeapByteBuffer@1486}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> {code}
> Setings object on the StressD Machine
> {code}
> columns = {org.apache.cassandra.stress.settings.SettingsColumn@810}
> maxColumnsPerKey = 5
> names = null
> {code}
> This leads to the null pointer in 
> {code}
> Exception in thread "Thread-1" java.lang.NullPointerException
> at 
> org.apache.cassandra.stress.settings.SettingsSchema.createKeySpacesThrift(SettingsSchema.java:94)
> at 
> org.apache.cassandra.stress.settings.SettingsSchema.createKeySpaces(SettingsSchema.java:67)
> at 
> org.apache.cassandra.stress.settings.StressSettings.maybeCreateKeyspaces(StressSettings.java:193)
> at org.apache.cassandra.stress.StressAction.run(StressAction.java:59)
> at java.lang.Thread.run(Thread.java:745)
> {code}
> Which refers to
> {code}
>for (int i = 0; i < settings.columns.names.size(); i++)
> standardCfDef.addToColumn_metadata(new 
> ColumnDef(settings.columns.names.get(i), "BytesType"));
> {code}
> Possible solution:
> Just use the settings.columns.namestr and convert them to byte buffers at 
> this point in the code. 



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


[jira] [Deleted] (CASSANDRA-7624) Created -By Mistake - Please Delete

2014-07-25 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis deleted CASSANDRA-7624:
--


> Created -By Mistake - Please Delete
> ---
>
> Key: CASSANDRA-7624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7624
> Project: Cassandra
>  Issue Type: Task
>Reporter: Yeshvanthni
>
> Created -By Mistake - Please Delete



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


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

2014-07-25 Thread JIRA

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

Andrés de la Peña edited comment on CASSANDRA-7575 at 7/25/14 5:50 PM:
---

Nice. It's targeted for 2.1.x and it should work in 3.0 too.


was (Author: adelapena):
Nice. It's targeted for for 2.1.x and it should work in 3.0 too.

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



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


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

2014-07-25 Thread JIRA

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

Andrés de la Peña commented on CASSANDRA-7575:
--

Nice. It's targeted for for 2.1.x and it should work in 3.0 too.

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



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


[jira] [Updated] (CASSANDRA-7624) Created -By Mistake - Please Delete

2014-07-25 Thread Yeshvanthni (JIRA)

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

Yeshvanthni updated CASSANDRA-7624:
---

Description: Created -By Mistake - Please Delete  (was: Look for 
sameThreadExecutor() find the future to which the callback is attached and do a 
future.get()

refer:testSimpleDeleteFailure_notification )

> Created -By Mistake - Please Delete
> ---
>
> Key: CASSANDRA-7624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7624
> Project: Cassandra
>  Issue Type: Task
>Reporter: Yeshvanthni
>
> Created -By Mistake - Please Delete



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


[jira] [Updated] (CASSANDRA-7624) Created -By Mistake - Please Delete

2014-07-25 Thread Yeshvanthni (JIRA)

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

Yeshvanthni updated CASSANDRA-7624:
---

Summary: Created -By Mistake - Please Delete  (was: Grid Async Test 
skipping test failures for some tests)

> Created -By Mistake - Please Delete
> ---
>
> Key: CASSANDRA-7624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7624
> Project: Cassandra
>  Issue Type: Task
>Reporter: Yeshvanthni
>
> Look for sameThreadExecutor() find the future to which the callback is 
> attached and do a future.get()
> refer:testSimpleDeleteFailure_notification 



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


[jira] [Created] (CASSANDRA-7624) Grid Async Test skipping test failures for some tests

2014-07-25 Thread Yeshvanthni (JIRA)
Yeshvanthni created CASSANDRA-7624:
--

 Summary: Grid Async Test skipping test failures for some tests
 Key: CASSANDRA-7624
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7624
 Project: Cassandra
  Issue Type: Bug
Reporter: Yeshvanthni


Look for sameThreadExecutor() find the future to which the callback is attached 
and do a future.get()

refer:testSimpleDeleteFailure_notification 



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


[jira] [Updated] (CASSANDRA-7624) Grid Async Test skipping test failures for some tests

2014-07-25 Thread Yeshvanthni (JIRA)

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

Yeshvanthni updated CASSANDRA-7624:
---

Issue Type: Task  (was: Bug)

> Grid Async Test skipping test failures for some tests
> -
>
> Key: CASSANDRA-7624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7624
> Project: Cassandra
>  Issue Type: Task
>Reporter: Yeshvanthni
>
> Look for sameThreadExecutor() find the future to which the callback is 
> attached and do a future.get()
> refer:testSimpleDeleteFailure_notification 



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


[jira] [Commented] (CASSANDRA-7574) Support Custom Predicate in CQL SELECT for Custom Secondary Index

2014-07-25 Thread Yeshvanthni (JIRA)

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

Yeshvanthni commented on CASSANDRA-7574:


for example,Even If the Custom Secondary Index is capable of handling say range 
queries like,
select * from tweet where tweettimepoc>xx and tweettimepoc  Support Custom Predicate in CQL SELECT for Custom Secondary Index
> --
>
> Key: CASSANDRA-7574
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7574
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Yeshvanthni
>Priority: Minor
>
> The SELECT query validation limits the predicates the custom secondary index 
> can support.
> Possible Approaches:
> -Introduction of a special predicate string like custom_predicate which 
> by-passes validation
> CREATE CUSTOM INDEX ON table(column)  USING 
> 'org.example.CustomSecondaryIndex';
> Select * from table where custom_predicate=" 
> something_only_custom_class_understands"
> This might open up possibilities like,
> - Range queries on secondary indexed columns etc
> - Wild cards



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


[jira] [Assigned] (CASSANDRA-7604) Test coverage for conditional DDL statements

2014-07-25 Thread Ryan McGuire (JIRA)

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

Ryan McGuire reassigned CASSANDRA-7604:
---

Assignee: Russ Hatch  (was: Ryan McGuire)

> Test coverage for conditional DDL statements
> 
>
> Key: CASSANDRA-7604
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7604
> Project: Cassandra
>  Issue Type: Test
>  Components: Tests
>Reporter: Tyler Hobbs
>Assignee: Russ Hatch
>
> We only have minimal test coverage of {{IF \[NOT\] EXISTS}} conditions for 
> DDL statements.  I think dtests are the right place to add those tests.
> We need to cover:
> * {{CREATE KEYSPACE IF NOT EXISTS}}
> * {{DROP KEYSPACE IF EXISTS}}
> * {{CREATE TABLE IF NOT EXISTS}}
> * {{DROP TABLE IF EXISTS}}
> * {{CREATE INDEX IF NOT EXISTS}}
> * {{DROP INDEX IF EXISTS}}
> * {{CREATE TYPE IF NOT EXISTS}}
> * {{DROP TYPE IF EXISTS}}
> The tests should also ensure that InvalidRequestExceptions are thrown if, for 
> example, you try to drop an index from a keyspace that doesn't exist 
> (regardless of whether {{IF EXISTS}} is used).



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


[jira] [Commented] (CASSANDRA-7559) Switch Stress from using math3.pair because it is unserializable

2014-07-25 Thread Russell Alexander Spitzer (JIRA)

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

Russell Alexander Spitzer commented on CASSANDRA-7559:
--

[~benedict], One last stress patch (for now). I would be really grateful if you 
could review.

> Switch Stress from using math3.pair because it is unserializable 
> -
>
> Key: CASSANDRA-7559
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7559
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Russell Alexander Spitzer
>Assignee: Russell Alexander Spitzer
> Attachments: CASSANDRA-7559-2.1.patch
>
>
> Stress uses org.apache.commons.math3.util.Pair to hold information in 
> settings because eventually it is used in commons.math3.distributions. This 
> makes the settings unserializable so we can't run with StressDemon.
> {code}
> /bin/cassandra-stress user no_warmup "ops(insert=1)" n=1 
> profile=cqlstress-example.yaml -sendto 127.0.0.1
> Exception in thread "main" java.io.NotSerializableException: 
> org.apache.commons.math3.util.Pair
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1183)
>   at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:347)
> at java.util.ArrayList.writeObject(ArrayList.java:742)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>   at 
> java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:988)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1495)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at 
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1547)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1508)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at 
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1547)
>   at 
> java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1508)
>   at 
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1431)
>   at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1177)
>   at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:347)
>   at org.apache.cassandra.stress.Stress.main(Stress.java:78)
> Control-C caught. Canceling running action and shutting down...
> {code}
> To fix this we can pass around serializable pairs and convert to 
> commons.math3 pairs before we actually pass the objects to the distribution 
> code. 



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


[jira] [Resolved] (CASSANDRA-7370) Create a new system table "node_config" to load cassandra.yaml config data.

2014-07-25 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko resolved CASSANDRA-7370.
--

Resolution: Later

kk, resolving as 'Later' for now.

> Create a new system table "node_config" to load cassandra.yaml config data.
> ---
>
> Key: CASSANDRA-7370
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7370
> Project: Cassandra
>  Issue Type: Wish
>  Components: Config
>Reporter: Hayato Shimizu
>Assignee: Robert Stupp
>Priority: Minor
>  Labels: ponies
> Attachments: 7370-v3.txt
>
>
> Currently the node configuration information specified in cassandra.yaml can 
> only be viewed via JMX or by looking at the file on individual machines.
> As an administrator, it would be extremely useful to be able to execute 
> queries like the following example;
> select concurrent_reads from system.node_config;
> which will list all the concurrent_reads value from all of the nodes in a 
> cluster.
> This will require a new table in the system keyspace and the data to be 
> loaded (if required) during the bootstrap, and updated when MBeans attribute 
> value updates are performed. The data from other nodes in the cluster is also 
> required in the table.



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


[jira] [Commented] (CASSANDRA-7608) StressD can't create keyspaces with Write Command

2014-07-25 Thread Russell Alexander Spitzer (JIRA)

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

Russell Alexander Spitzer commented on CASSANDRA-7608:
--

[~benedict], Another Stress ticket that would really help us out :)

> StressD can't create keyspaces with Write Command
> -
>
> Key: CASSANDRA-7608
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7608
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Russell Alexander Spitzer
>Assignee: Russell Alexander Spitzer
>Priority: Minor
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-7608-2.1.patch
>
>
> It is impossible to run the default stress command via the dameon ./stress 
> write
> Because the column names are HeapByteBuffers so they get ignored during 
> serilization (no error is thrown) and then when the object is deserialized on 
> the server the settings.columns.names is null. This leads to a null pointer 
> on the dameon for what would have worked had it run locally.
> Settings object on the Local machine
> {code}
> columns = {org.apache.cassandra.stress.settings.SettingsColumn@1465}
> maxColumnsPerKey = 5
> names = {java.util.Arrays$ArrayList@1471} size = 5
> [0] = {java.nio.HeapByteBuffer@1478}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [1] = {java.nio.HeapByteBuffer@1483}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [2] = {java.nio.HeapByteBuffer@1484}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [3] = {java.nio.HeapByteBuffer@1485}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> [4] = {java.nio.HeapByteBuffer@1486}"java.nio.HeapByteBuffer[pos=0 lim=2 
> cap=2]"
> {code}
> Setings object on the StressD Machine
> {code}
> columns = {org.apache.cassandra.stress.settings.SettingsColumn@810}
> maxColumnsPerKey = 5
> names = null
> {code}
> This leads to the null pointer in 
> {code}
> Exception in thread "Thread-1" java.lang.NullPointerException
> at 
> org.apache.cassandra.stress.settings.SettingsSchema.createKeySpacesThrift(SettingsSchema.java:94)
> at 
> org.apache.cassandra.stress.settings.SettingsSchema.createKeySpaces(SettingsSchema.java:67)
> at 
> org.apache.cassandra.stress.settings.StressSettings.maybeCreateKeyspaces(StressSettings.java:193)
> at org.apache.cassandra.stress.StressAction.run(StressAction.java:59)
> at java.lang.Thread.run(Thread.java:745)
> {code}
> Which refers to
> {code}
>for (int i = 0; i < settings.columns.names.size(); i++)
> standardCfDef.addToColumn_metadata(new 
> ColumnDef(settings.columns.names.get(i), "BytesType"));
> {code}
> Possible solution:
> Just use the settings.columns.namestr and convert them to byte buffers at 
> this point in the code. 



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


[jira] [Commented] (CASSANDRA-7622) Implement virtual tables

2014-07-25 Thread Robert Stupp (JIRA)

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

Robert Stupp commented on CASSANDRA-7622:
-

So there would be two kinds of "vTables"? One that is consistent over all nodes 
(e.g. cluster status) and one that has node-dependent values (e.g. 
configuration per node)? I'm not against this one (it's great to have vTables) 
- but for example querying information from all nodes could be very expensive 
large clusters (1000 nodes) - the coordinater would have to query all 1000 
cluster nodes. I guess that [~hayato.shimizu] had something like {{SELECT 
DISTINCT seed_nodes FROM node_config}} in mind to find configuration mistakes.

> Implement virtual tables
> 
>
> Key: CASSANDRA-7622
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7622
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Tupshin Harper
> Fix For: 3.0
>
>
> There are a variety of reasons to want virtual tables, which would be any 
> table that would be backed by an API, rather than data explicitly managed and 
> stored as sstables.
> One possible use case would be to expose JMX data through CQL as a 
> resurrection of CASSANDRA-3527.
> Another is a more general framework to implement the ability to expose yaml 
> configuration information. So it would be an alternate approach to 
> CASSANDRA-7370.
> A possible implementation would be in terms of CASSANDRA-7443, but I am not 
> presupposing.



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


  1   2   >