[jira] [Comment Edited] (CASSANDRA-7891) Select an element inside a UDT throws an index error
[
https://issues.apache.org/jira/browse/CASSANDRA-7891?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14123579#comment-14123579
]
Patrick McFadin edited comment on CASSANDRA-7891 at 9/7/14 4:44 AM:
It was trunk. Sorry, the version in cqlsh was 2.1.1.
was (Author: pmcfadin):
It was truck. Sorry, the version in cqlsh was 2.1.1.
> Select an element inside a UDT throws an index error
>
>
> Key: CASSANDRA-7891
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7891
> Project: Cassandra
> Issue Type: Bug
>Reporter: Patrick McFadin
> Fix For: 3.0
>
>
> Create the following data model:
> {noformat}
> CREATE TYPE address (
> street text,
> city text,
> zip_code int,
> phones set
> );
>
> CREATE TYPE fullname (
> firstname text,
> lastname text
> );
> CREATE TABLE users (
> id uuid PRIMARY KEY,
> name FROZEN ,
> addresses map>
> );
> INSERT INTO users (id, name)
> VALUES (62c36092-82a1-3a00-93d1-46196ee77204, {firstname: 'Marie-Claude',
> lastname: 'Josset'});
> {noformat}
> When trying to select a sub-field in the name type:
> {noformat}
> SELECT name.lastname FROM users WHERE id=62c36092-82a1-3a00-93d1-46196ee77204;
> {noformat}
> You get the following error:
> {noformat}
> list index out of range
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14124747#comment-14124747
]
Mikhail Stepura commented on CASSANDRA-7895:
Committed, thanks
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.0, 2.1.1
>
> Attachments: CASSANDRA-2.1.0-7895.patch
>
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[1/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 4f3a9c0bd -> 9aff086a4
refs/heads/cassandra-2.1.0 838151cab -> 1b3afd817
refs/heads/trunk e1651cb07 -> 131097c2c
(cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
patch by Mikhail Stepura; reviewed by for CASSANDRA-7895
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b3afd81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b3afd81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b3afd81
Branch: refs/heads/cassandra-2.1
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 18:45:08 2014 -0700
--
CHANGES.txt| 2 ++
pylib/cqlshlib/cql3handling.py | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0
+ * (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
+ (CASSANDRA-7895)
* Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
::= "ALTER" "TYPE" ut=
;
- ::= "RENAME" "TO" typename=
- | "ALTER" existcol= "TYPE"
+ ::= "ALTER" existcol= "TYPE"
| "ADD" newcol=
| "RENAME" existcol= "TO" newcol=
+ ( "AND" existcol= "TO" newcol= )*
;
'''
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
return map(maybe_escape_name, fields)
explain_completion('alterInstructions', 'newcol', '')
-explain_completion('alterTypeInstructions', 'typename', '')
explain_completion('alterTypeInstructions', 'newcol', '')
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/9aff086a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aff086a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aff086a Branch: refs/heads/cassandra-2.1 Commit: 9aff086a489759195f57439bb4c3e46062a0d3de Parents: 4f3a9c0 1b3afd8 Author: Mikhail Stepura Authored: Sat Sep 6 19:57:56 2014 -0700 Committer: Mikhail Stepura Committed: Sat Sep 6 19:57:56 2014 -0700 -- CHANGES.txt| 2 ++ pylib/cqlshlib/cql3handling.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/CHANGES.txt -- diff --cc CHANGES.txt index 5271a83,46836bf..a8fd129 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,6 +1,58 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion +(CASSANDRA-7895) * Fixed IllegalStateException in anticompaction (CASSANDRA-7892) * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863) * Avoid exposing internal classes over JMX (CASSANDRA-7879) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/pylib/cqlshlib/cql3handling.py --
[3/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
(cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
patch by Mikhail Stepura; reviewed by for CASSANDRA-7895
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b3afd81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b3afd81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b3afd81
Branch: refs/heads/trunk
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 18:45:08 2014 -0700
--
CHANGES.txt| 2 ++
pylib/cqlshlib/cql3handling.py | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0
+ * (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
+ (CASSANDRA-7895)
* Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
::= "ALTER" "TYPE" ut=
;
- ::= "RENAME" "TO" typename=
- | "ALTER" existcol= "TYPE"
+ ::= "ALTER" existcol= "TYPE"
| "ADD" newcol=
| "RENAME" existcol= "TO" newcol=
+ ( "AND" existcol= "TO" newcol= )*
;
'''
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
return map(maybe_escape_name, fields)
explain_completion('alterInstructions', 'newcol', '')
-explain_completion('alterTypeInstructions', 'typename', '')
explain_completion('alterTypeInstructions', 'newcol', '')
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
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/131097c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/131097c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/131097c2 Branch: refs/heads/trunk Commit: 131097c2cbf95fe5134ddc2bdd27ff79c9b4a8c7 Parents: e1651cb 9aff086 Author: Mikhail Stepura Authored: Sat Sep 6 19:58:09 2014 -0700 Committer: Mikhail Stepura Committed: Sat Sep 6 19:58:09 2014 -0700 -- CHANGES.txt| 2 ++ pylib/cqlshlib/cql3handling.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/pylib/cqlshlib/cql3handling.py --
[2/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
(cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
patch by Mikhail Stepura; reviewed by for CASSANDRA-7895
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b3afd81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b3afd81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b3afd81
Branch: refs/heads/cassandra-2.1.0
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 18:45:08 2014 -0700
--
CHANGES.txt| 2 ++
pylib/cqlshlib/cql3handling.py | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0
+ * (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion
+ (CASSANDRA-7895)
* Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
::= "ALTER" "TYPE" ut=
;
- ::= "RENAME" "TO" typename=
- | "ALTER" existcol= "TYPE"
+ ::= "ALTER" existcol= "TYPE"
| "ADD" newcol=
| "RENAME" existcol= "TO" newcol=
+ ( "AND" existcol= "TO" newcol= )*
;
'''
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
return map(maybe_escape_name, fields)
explain_completion('alterInstructions', 'newcol', '')
-explain_completion('alterTypeInstructions', 'typename', '')
explain_completion('alterTypeInstructions', 'newcol', '')
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/9aff086a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aff086a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aff086a Branch: refs/heads/trunk Commit: 9aff086a489759195f57439bb4c3e46062a0d3de Parents: 4f3a9c0 1b3afd8 Author: Mikhail Stepura Authored: Sat Sep 6 19:57:56 2014 -0700 Committer: Mikhail Stepura Committed: Sat Sep 6 19:57:56 2014 -0700 -- CHANGES.txt| 2 ++ pylib/cqlshlib/cql3handling.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/CHANGES.txt -- diff --cc CHANGES.txt index 5271a83,46836bf..a8fd129 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,6 +1,58 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion +(CASSANDRA-7895) * Fixed IllegalStateException in anticompaction (CASSANDRA-7892) * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863) * Avoid exposing internal classes over JMX (CASSANDRA-7879) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/pylib/cqlshlib/cql3handling.py --
[jira] [Commented] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14124745#comment-14124745
]
Aleksey Yeschenko commented on CASSANDRA-7895:
--
+1
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.0, 2.1.1
>
> Attachments: CASSANDRA-2.1.0-7895.patch
>
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7895:
---
Attachment: CASSANDRA-2.1.0-7895.patch
I'm attaching a patch to adjust cqlsh tab-completion
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.0
>
> Attachments: CASSANDRA-2.1.0-7895.patch
>
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-7892) Hashmap IllegalStateException in anticompaction
[
https://issues.apache.org/jira/browse/CASSANDRA-7892?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7892:
---
Fix Version/s: 2.1.0
> Hashmap IllegalStateException in anticompaction
> ---
>
> Key: CASSANDRA-7892
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7892
> Project: Cassandra
> Issue Type: Bug
> Environment: Cassandra 2.1 rc 5
>Reporter: Johan Bjork
>Assignee: Mikhail Stepura
> Fix For: 2.1.0, 2.1.1
>
> Attachments: CASSANDRA-2.1-7892.patch
>
>
> {noformat}
> ERROR [AntiEntropyStage:4] 2014-09-05 19:55:06,439 CassandraDaemon.java:166 -
> Exception in thread Thread[AntiEntropyStage:4,5,main]
> java.lang.RuntimeException: java.lang.RuntimeException:
> java.util.concurrent.ExecutionException: java.lang.IllegalStateException
> at
> org.apache.cassandra.repair.RepairMessageVerbHandler.doVerb(RepairMessageVerbHandler.java:117)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:62)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> ~[na:1.7.0_60]
> at java.lang.Thread.run(Thread.java:745) ~[na:1.7.0_60]
> Caused by: java.lang.RuntimeException:
> java.util.concurrent.ExecutionException: java.lang.IllegalStateException
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:411)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFutures(FBUtilities.java:400)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.repair.RepairMessageVerbHandler.doVerb(RepairMessageVerbHandler.java:113)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> ... 4 common frames omitted
> Caused by: java.util.concurrent.ExecutionException:
> java.lang.IllegalStateException
> at java.util.concurrent.FutureTask.report(FutureTask.java:122)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.get(FutureTask.java:188)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:407)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> ... 6 common frames omitted
> Caused by: java.lang.IllegalStateException: null
> at java.util.HashMap$HashIterator.remove(HashMap.java:938)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.db.compaction.CompactionManager.performAnticompaction(CompactionManager.java:425)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:381)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.run(FutureTask.java:262)
> ~[na:1.7.0_60]
> ... 3 common frames omitted
> {noformat}
> And on a different host:
> {noformat}
> ERROR [CompactionExecutor:43] 2014-09-05 19:55:06,376
> CassandraDaemon.java:166 - Exception in thread Thread[CompactionExecutor:4
> 3,1,main]
> java.lang.IllegalStateException: null
> at java.util.HashMap$HashIterator.remove(HashMap.java:938)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.db.compaction.CompactionManager.performAnticompaction(CompactionManager.java:425)
> ~[apache-cassa
> ndra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:381)
> ~[apache-cassandra-2.1
> .0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.run(FutureTask.java:262)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> [na:1.7.0_60]
> at java.lang.Thread.run(Thread.java:745) [na:1.7.0_60]
> {noformat}
> The exceptions happened in our test environment after I added a bunch of
> new-nodes at the same time that was in a different (previously non-existing)
> datacenter. The datacenter is determined using GossipingPropertyFileSnitch
> and started repa
[1/6] git commit: Fixed handling of non-intersecting ranges in anticompaction
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 7d215692f -> 4f3a9c0bd
refs/heads/cassandra-2.1.0 5d5401d67 -> 838151cab
refs/heads/trunk bd889dc41 -> e1651cb07
Fixed handling of non-intersecting ranges in anticompaction
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7892
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/838151ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/838151ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/838151ca
Branch: refs/heads/cassandra-2.1
Commit: 838151caba98f88ff583e01bad087d4ead4a764d
Parents: 5d5401d
Author: Mikhail Stepura
Authored: Fri Sep 5 22:44:38 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 17:05:27 2014 -0700
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 1 +
.../db/compaction/AntiCompactionTest.java | 76 ++--
3 files changed, 58 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 28c39e6..ea9a05c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0
+ * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
* Add null check for keys when freezing collection (CASSANDRA-7869)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 09c068f..33a750b 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -430,6 +430,7 @@ public class CompactionManager implements
CompactionManagerMBean
logger.info("SSTable {} ({}) does not intersect repaired
range {}, not touching repairedAt.", sstable, sstableRange, r);
nonAnticompacting.add(sstable);
sstableIterator.remove();
+break;
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index b8637a8..6e1ac5f 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -17,12 +17,17 @@
*/
package org.apache.cassandra.db.compaction;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -37,9 +42,10 @@ import
org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Test;
+
+import com.google.common.collect.Iterables;
public class AntiCompactionTest extends SchemaLoader
{
@@ -49,22 +55,7 @@ public class AntiCompactionTest extends SchemaLoader
@Test
public void antiCompactOne() throws InterruptedException,
ExecutionException, IOException
{
-Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF);
-store.disableAutoCompaction();
-long timestamp = System.currentTimeMillis();
-for (int i = 0; i < 10; i++)
-{
-DecoratedKey key = Util.dk(Integer.toString(i));
-Mutation rm = new Mutation(KEYSPACE1, key.getKey());
-for (int j = 0; j < 10; j++)
-rm.add("Standard1
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/4f3a9c0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f3a9c0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f3a9c0b Branch: refs/heads/cassandra-2.1 Commit: 4f3a9c0bd7ac9dccae3e805c15331df32b8b0b2a Parents: 7d21569 838151c Author: Mikhail Stepura Authored: Sat Sep 6 17:09:03 2014 -0700 Committer: Mikhail Stepura Committed: Sat Sep 6 17:09:03 2014 -0700 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 1 + .../db/compaction/AntiCompactionTest.java | 76 ++-- 3 files changed, 58 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f3a9c0b/CHANGES.txt -- diff --cc CHANGES.txt index de7c9da,ea9a05c..5271a83 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,5 +1,57 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * Fixed IllegalStateException in anticompaction (CASSANDRA-7892) * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863) * Avoid exposing internal classes over JMX (CASSANDRA-7879) * Add null check for keys when freezing collection (CASSANDRA-7869) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f3a9c0b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/4f3a9c0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f3a9c0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f3a9c0b Branch: refs/heads/trunk Commit: 4f3a9c0bd7ac9dccae3e805c15331df32b8b0b2a Parents: 7d21569 838151c Author: Mikhail Stepura Authored: Sat Sep 6 17:09:03 2014 -0700 Committer: Mikhail Stepura Committed: Sat Sep 6 17:09:03 2014 -0700 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 1 + .../db/compaction/AntiCompactionTest.java | 76 ++-- 3 files changed, 58 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f3a9c0b/CHANGES.txt -- diff --cc CHANGES.txt index de7c9da,ea9a05c..5271a83 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,5 +1,57 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * Fixed IllegalStateException in anticompaction (CASSANDRA-7892) * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863) * Avoid exposing internal classes over JMX (CASSANDRA-7879) * Add null check for keys when freezing collection (CASSANDRA-7869) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f3a9c0b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[2/6] git commit: Fixed handling of non-intersecting ranges in anticompaction
Fixed handling of non-intersecting ranges in anticompaction
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7892
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/838151ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/838151ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/838151ca
Branch: refs/heads/cassandra-2.1.0
Commit: 838151caba98f88ff583e01bad087d4ead4a764d
Parents: 5d5401d
Author: Mikhail Stepura
Authored: Fri Sep 5 22:44:38 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 17:05:27 2014 -0700
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 1 +
.../db/compaction/AntiCompactionTest.java | 76 ++--
3 files changed, 58 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 28c39e6..ea9a05c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0
+ * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
* Add null check for keys when freezing collection (CASSANDRA-7869)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 09c068f..33a750b 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -430,6 +430,7 @@ public class CompactionManager implements
CompactionManagerMBean
logger.info("SSTable {} ({}) does not intersect repaired
range {}, not touching repairedAt.", sstable, sstableRange, r);
nonAnticompacting.add(sstable);
sstableIterator.remove();
+break;
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index b8637a8..6e1ac5f 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -17,12 +17,17 @@
*/
package org.apache.cassandra.db.compaction;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -37,9 +42,10 @@ import
org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Test;
+
+import com.google.common.collect.Iterables;
public class AntiCompactionTest extends SchemaLoader
{
@@ -49,22 +55,7 @@ public class AntiCompactionTest extends SchemaLoader
@Test
public void antiCompactOne() throws InterruptedException,
ExecutionException, IOException
{
-Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF);
-store.disableAutoCompaction();
-long timestamp = System.currentTimeMillis();
-for (int i = 0; i < 10; i++)
-{
-DecoratedKey key = Util.dk(Integer.toString(i));
-Mutation rm = new Mutation(KEYSPACE1, key.getKey());
-for (int j = 0; j < 10; j++)
-rm.add("Standard1", Util.cellname(Integer.toString(j)),
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- timestamp,
- 0);
-rm.apply();
[3/6] git commit: Fixed handling of non-intersecting ranges in anticompaction
Fixed handling of non-intersecting ranges in anticompaction
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7892
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/838151ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/838151ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/838151ca
Branch: refs/heads/trunk
Commit: 838151caba98f88ff583e01bad087d4ead4a764d
Parents: 5d5401d
Author: Mikhail Stepura
Authored: Fri Sep 5 22:44:38 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 17:05:27 2014 -0700
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 1 +
.../db/compaction/AntiCompactionTest.java | 76 ++--
3 files changed, 58 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 28c39e6..ea9a05c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0
+ * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
* cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
* Avoid exposing internal classes over JMX (CASSANDRA-7879)
* Add null check for keys when freezing collection (CASSANDRA-7869)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 09c068f..33a750b 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -430,6 +430,7 @@ public class CompactionManager implements
CompactionManagerMBean
logger.info("SSTable {} ({}) does not intersect repaired
range {}, not touching repairedAt.", sstable, sstableRange, r);
nonAnticompacting.add(sstable);
sstableIterator.remove();
+break;
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/838151ca/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index b8637a8..6e1ac5f 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -17,12 +17,17 @@
*/
package org.apache.cassandra.db.compaction;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -37,9 +42,10 @@ import
org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Test;
+
+import com.google.common.collect.Iterables;
public class AntiCompactionTest extends SchemaLoader
{
@@ -49,22 +55,7 @@ public class AntiCompactionTest extends SchemaLoader
@Test
public void antiCompactOne() throws InterruptedException,
ExecutionException, IOException
{
-Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF);
-store.disableAutoCompaction();
-long timestamp = System.currentTimeMillis();
-for (int i = 0; i < 10; i++)
-{
-DecoratedKey key = Util.dk(Integer.toString(i));
-Mutation rm = new Mutation(KEYSPACE1, key.getKey());
-for (int j = 0; j < 10; j++)
-rm.add("Standard1", Util.cellname(Integer.toString(j)),
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- timestamp,
- 0);
-rm.apply();
-
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1651cb0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1651cb0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1651cb0
Branch: refs/heads/trunk
Commit: e1651cb07b7de35a2b7076b4b1c82572fee5ad63
Parents: bd889dc 4f3a9c0
Author: Mikhail Stepura
Authored: Sat Sep 6 17:20:24 2014 -0700
Committer: Mikhail Stepura
Committed: Sat Sep 6 17:20:24 2014 -0700
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 1 +
.../db/compaction/AntiCompactionTest.java | 49
3 files changed, 41 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1651cb0/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1651cb0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1651cb0/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index f632a65,6e1ac5f..cd5dc7f
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@@ -23,15 -29,8 +29,9 @@@ import java.util.Collection
import java.util.List;
import java.util.concurrent.ExecutionException;
- import org.apache.cassandra.config.KSMetaData;
- import org.apache.cassandra.exceptions.ConfigurationException;
- import org.apache.cassandra.locator.SimpleStrategy;
- import org.junit.BeforeClass;
- import org.junit.After;
- import org.junit.Test;
-
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
++import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.Keyspace;
@@@ -39,39 -38,20 +39,44 @@@ import org.apache.cassandra.db.Mutation
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
++import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
++import org.apache.cassandra.locator.SimpleStrategy;
+import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.ByteBufferUtil;
- import static junit.framework.Assert.assertFalse;
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
++
+ import org.junit.After;
++import org.junit.BeforeClass;
+ import org.junit.Test;
+
+ import com.google.common.collect.Iterables;
-public class AntiCompactionTest extends SchemaLoader
+public class AntiCompactionTest
{
-private static final String KEYSPACE1 = "Keyspace1";
+private static final String KEYSPACE1 = "AntiCompactionTest";
private static final String CF = "Standard1";
+
+@BeforeClass
+public static void defineSchema() throws ConfigurationException
+{
+SchemaLoader.prepareServer();
+SchemaLoader.createKeyspace(KEYSPACE1,
+SimpleStrategy.class,
+KSMetaData.optsWithRF(1),
+SchemaLoader.standardCFMD(KEYSPACE1, CF));
+}
+
+@After
+public void truncateCF()
+{
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF);
+store.truncateBlocking();
+}
+
@Test
public void antiCompactOne() throws InterruptedException,
ExecutionException, IOException
{
@@@ -157,50 -110,28 +162,74 @@@
{
Keyspace keyspace = Keyspace.open(KEYSPACE1);
ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF);
+store.setCompactionStrategyClass(compactionStrategy);
store.disableAutoCompaction();
-long timestamp = System.currentTimeMillis();
-for (int i = 0; i < 10; i++)
+
+for (int table = 0; table < 10; table++)
{
-DecoratedKey key = Util.dk(Integer.toString(i));
-Mutation rm = new Mutation(KEYSPACE1, key.getKey());
-for (int j = 0; j < 10; j++)
-rm.add("Standard1", Util.cellnam
[jira] [Updated] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7895:
---
Fix Version/s: 2.1.0
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>Priority: Minor
> Fix For: 2.1.0
>
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-7892) Hashmap IllegalStateException in anticompaction
[
https://issues.apache.org/jira/browse/CASSANDRA-7892?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14124616#comment-14124616
]
Yuki Morishita commented on CASSANDRA-7892:
---
+1.
I think we should put this into 2.1.0, if it isn't too late.
Trivial fix to major bug.
> Hashmap IllegalStateException in anticompaction
> ---
>
> Key: CASSANDRA-7892
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7892
> Project: Cassandra
> Issue Type: Bug
> Environment: Cassandra 2.1 rc 5
>Reporter: Johan Bjork
>Assignee: Mikhail Stepura
> Fix For: 2.1.1
>
> Attachments: CASSANDRA-2.1-7892.patch
>
>
> {noformat}
> ERROR [AntiEntropyStage:4] 2014-09-05 19:55:06,439 CassandraDaemon.java:166 -
> Exception in thread Thread[AntiEntropyStage:4,5,main]
> java.lang.RuntimeException: java.lang.RuntimeException:
> java.util.concurrent.ExecutionException: java.lang.IllegalStateException
> at
> org.apache.cassandra.repair.RepairMessageVerbHandler.doVerb(RepairMessageVerbHandler.java:117)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:62)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> ~[na:1.7.0_60]
> at java.lang.Thread.run(Thread.java:745) ~[na:1.7.0_60]
> Caused by: java.lang.RuntimeException:
> java.util.concurrent.ExecutionException: java.lang.IllegalStateException
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:411)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFutures(FBUtilities.java:400)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.repair.RepairMessageVerbHandler.doVerb(RepairMessageVerbHandler.java:113)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> ... 4 common frames omitted
> Caused by: java.util.concurrent.ExecutionException:
> java.lang.IllegalStateException
> at java.util.concurrent.FutureTask.report(FutureTask.java:122)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.get(FutureTask.java:188)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:407)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> ... 6 common frames omitted
> Caused by: java.lang.IllegalStateException: null
> at java.util.HashMap$HashIterator.remove(HashMap.java:938)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.db.compaction.CompactionManager.performAnticompaction(CompactionManager.java:425)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:381)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.run(FutureTask.java:262)
> ~[na:1.7.0_60]
> ... 3 common frames omitted
> {noformat}
> And on a different host:
> {noformat}
> ERROR [CompactionExecutor:43] 2014-09-05 19:55:06,376
> CassandraDaemon.java:166 - Exception in thread Thread[CompactionExecutor:4
> 3,1,main]
> java.lang.IllegalStateException: null
> at java.util.HashMap$HashIterator.remove(HashMap.java:938)
> ~[na:1.7.0_60]
> at
> org.apache.cassandra.db.compaction.CompactionManager.performAnticompaction(CompactionManager.java:425)
> ~[apache-cassa
> ndra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:381)
> ~[apache-cassandra-2.1
> .0-rc5.jar:2.1.0-rc5]
> at
> org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
> ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5]
> at
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
> ~[na:1.7.0_60]
> at java.util.concurrent.FutureTask.run(FutureTask.java:262)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> ~[na:1.7.0_60]
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> [na:1.7.0_60]
> at java.lang.Thread.run(Thread.java:745) [na:1.7.0_60]
> {noformat}
> The exceptions happened in our test environment after I added a bunch of
> new-nodes at the same time that was in a different (previo
git commit: remove dead code
Repository: cassandra
Updated Branches:
refs/heads/trunk 5cc7a11ab -> bd889dc41
remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd889dc4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd889dc4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd889dc4
Branch: refs/heads/trunk
Commit: bd889dc41f97dcbf6d2b223b73f934a64c261c5c
Parents: 5cc7a11
Author: Dave Brosius
Authored: Sat Sep 6 14:44:07 2014 -0400
Committer: Dave Brosius
Committed: Sat Sep 6 14:44:07 2014 -0400
--
src/java/org/apache/cassandra/utils/UUIDGen.java | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd889dc4/src/java/org/apache/cassandra/utils/UUIDGen.java
--
diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java
b/src/java/org/apache/cassandra/utils/UUIDGen.java
index 5c39c2c..33f14a4 100644
--- a/src/java/org/apache/cassandra/utils/UUIDGen.java
+++ b/src/java/org/apache/cassandra/utils/UUIDGen.java
@@ -243,12 +243,6 @@ public class UUIDGen
return createTime(nanosSince);
}
-/** @param when time in milliseconds */
-private long createTimeUnsafe(long when)
-{
-return createTimeUnsafe(when, 0);
-}
-
private long createTimeUnsafe(long when, int nanos)
{
long nanosSince = ((when - START_EPOCH) * 1) + nanos;
git commit: fix boxing confusion
Repository: cassandra
Updated Branches:
refs/heads/trunk ad3056199 -> 5cc7a11ab
fix boxing confusion
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cc7a11a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc7a11a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc7a11a
Branch: refs/heads/trunk
Commit: 5cc7a11ab8684af2f9b127341f4029657b5fa3b2
Parents: ad30561
Author: Dave Brosius
Authored: Sat Sep 6 14:39:54 2014 -0400
Committer: Dave Brosius
Committed: Sat Sep 6 14:39:54 2014 -0400
--
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
src/java/org/apache/cassandra/dht/RangeStreamer.java | 2 +-
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 4 ++--
src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 2 +-
.../apache/cassandra/stress/settings/OptionAnyProbabilities.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/db/Memtable.java
--
diff --git a/src/java/org/apache/cassandra/db/Memtable.java
b/src/java/org/apache/cassandra/db/Memtable.java
index 4825676..ef157a3 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -52,7 +52,7 @@ public class Memtable
private static final Logger logger =
LoggerFactory.getLogger(Memtable.class);
static final MemtablePool MEMORY_POOL =
DatabaseDescriptor.getMemtableAllocatorPool();
-private static final int ROW_OVERHEAD_HEAP_SIZE =
estimateRowOverhead(Integer.valueOf(System.getProperty("cassandra.memtable_row_overhead_computation_step",
"10")));
+private static final int ROW_OVERHEAD_HEAP_SIZE =
estimateRowOverhead(Integer.parseInt(System.getProperty("cassandra.memtable_row_overhead_computation_step",
"10")));
private final MemtableAllocator allocator;
private final AtomicLong liveDataSize = new AtomicLong(0);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/dht/RangeStreamer.java
--
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java
b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index d84a951..be58d77 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -47,7 +47,7 @@ import org.apache.cassandra.utils.FBUtilities;
public class RangeStreamer
{
private static final Logger logger =
LoggerFactory.getLogger(RangeStreamer.class);
-public static final boolean useStrictConsistency =
Boolean.valueOf(System.getProperty("cassandra.consistent.rangemovement","true"));
+public static final boolean useStrictConsistency =
Boolean.parseBoolean(System.getProperty("cassandra.consistent.rangemovement","true"));
private final Collection tokens;
private final TokenMetadata metadata;
private final InetAddress address;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 73a291b..30d742c 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -525,7 +525,7 @@ public class CqlConfigHelper
String setting = conf.get(parameter);
if (setting == null)
return Optional.absent();
-return Optional.of(Integer.parseInt(setting));
+return Optional.of(Integer.valueOf(setting));
}
private static Optional getBooleanSetting(String parameter,
Configuration conf)
@@ -533,7 +533,7 @@ public class CqlConfigHelper
String setting = conf.get(parameter);
if (setting == null)
return Optional.absent();
-return Optional.of(Boolean.parseBoolean(setting));
+return Optional.of(Boolean.valueOf(setting));
}
private static Optional getStringSetting(String parameter,
Configuration conf)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index bcf9869..3baf833 100644
--- a/src/java/org/apache/cassandra/tools/Standalone
git commit: use parameterized logging
Repository: cassandra
Updated Branches:
refs/heads/trunk 0d1173117 -> ad3056199
use parameterized logging
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad305619
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad305619
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad305619
Branch: refs/heads/trunk
Commit: ad3056199c46d22edd67ddce2f61fb2e2ff9eed9
Parents: 0d11731
Author: Dave Brosius
Authored: Sat Sep 6 14:32:46 2014 -0400
Committer: Dave Brosius
Committed: Sat Sep 6 14:32:46 2014 -0400
--
.../org/apache/cassandra/streaming/DefaultConnectionFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad305619/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
--
diff --git
a/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
b/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
index f711490..5c27ff3 100644
--- a/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
+++ b/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
@@ -60,7 +60,7 @@ public class DefaultConnectionFactory implements
StreamConnectionFactory
throw e;
long waitms = DatabaseDescriptor.getRpcTimeout() *
(long)Math.pow(2, attempts);
-logger.warn("Failed attempt " + attempts + " to connect to " +
peer + ". Retrying in " + waitms + " ms. (" + e + ")");
+logger.warn("Failed attempt {} to connect to {}. Retrying in
{} ms. ({})", attempts, peer, waitms, e);
try
{
Thread.sleep(waitms);
git commit: make Allocator a static inner class
Repository: cassandra
Updated Branches:
refs/heads/trunk 182051c45 -> 0d1173117
make Allocator a static inner class
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d117311
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d117311
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d117311
Branch: refs/heads/trunk
Commit: 0d11731178ca409a36f4ff67f441a5190eea21fe
Parents: 182051c
Author: Dave Brosius
Authored: Sat Sep 6 14:29:38 2014 -0400
Committer: Dave Brosius
Committed: Sat Sep 6 14:29:38 2014 -0400
--
src/java/org/apache/cassandra/utils/memory/HeapPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d117311/src/java/org/apache/cassandra/utils/memory/HeapPool.java
--
diff --git a/src/java/org/apache/cassandra/utils/memory/HeapPool.java
b/src/java/org/apache/cassandra/utils/memory/HeapPool.java
index a04947c..3d3ca09 100644
--- a/src/java/org/apache/cassandra/utils/memory/HeapPool.java
+++ b/src/java/org/apache/cassandra/utils/memory/HeapPool.java
@@ -43,7 +43,7 @@ public class HeapPool extends MemtablePool
return new Allocator(this);
}
-public class Allocator extends MemtableBufferAllocator
+public static class Allocator extends MemtableBufferAllocator
{
Allocator(HeapPool pool)
{
git commit: simplify/avoid possible npes
Repository: cassandra
Updated Branches:
refs/heads/trunk 995904c2d -> 182051c45
simplify/avoid possible npes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/182051c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/182051c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/182051c4
Branch: refs/heads/trunk
Commit: 182051c453c30f6941b49c030092008918cfa2e2
Parents: 995904c
Author: Dave Brosius
Authored: Sat Sep 6 14:22:08 2014 -0400
Committer: Dave Brosius
Committed: Sat Sep 6 14:22:08 2014 -0400
--
src/java/org/apache/cassandra/auth/Resources.java| 2 +-
src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
src/java/org/apache/cassandra/cql3/ResultSet.java| 2 +-
src/java/org/apache/cassandra/db/context/CounterContext.java | 2 +-
src/java/org/apache/cassandra/db/marshal/TypeParser.java | 4 ++--
src/java/org/apache/cassandra/exceptions/RepairException.java| 2 +-
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
.../cassandra/hadoop/AbstractColumnFamilyRecordWriter.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamEvent.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamLockfile.java | 2 +-
src/java/org/apache/cassandra/thrift/TCustomServerSocket.java| 2 +-
src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
src/java/org/apache/cassandra/tools/NodeTool.java| 2 +-
.../cassandra/stress/operations/predefined/CqlOperation.java | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/auth/Resources.java
--
diff --git a/src/java/org/apache/cassandra/auth/Resources.java
b/src/java/org/apache/cassandra/auth/Resources.java
index 86900f9..47a7aa4 100644
--- a/src/java/org/apache/cassandra/auth/Resources.java
+++ b/src/java/org/apache/cassandra/auth/Resources.java
@@ -58,7 +58,7 @@ public final class Resources
if (component instanceof byte[])
buff.append(Hex.bytesToHex((byte[])component));
else
-buff.append(component.toString());
+buff.append(component);
}
return buff.toString();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/cli/CliClient.java
--
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java
b/src/java/org/apache/cassandra/cli/CliClient.java
index c6b3bcd..703d4c1 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -2102,7 +2102,7 @@ public class CliClient
UUID sessionId =
TimeUUIDType.instance.compose(thriftClient.trace_next_query());
-sessionState.out.println("Will trace next query. Session ID: " +
sessionId.toString());
+sessionState.out.println("Will trace next query. Session ID: " +
sessionId);
}
private void describeKeySpace(String keySpaceName, KsDef metadata) throws
TException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/cql3/ResultSet.java
--
diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java
b/src/java/org/apache/cassandra/cql3/ResultSet.java
index 25635fa..30b5c4e 100644
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@ -333,7 +333,7 @@ public class ResultSet
{
for (ColumnSpecification name : names)
{
-sb.append("[").append(name.name.toString());
+sb.append("[").append(name.name);
sb.append("(").append(name.ksName).append(",
").append(name.cfName).append(")");
sb.append(", ").append(name.type).append("]");
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/db/context/CounterContext.java
--
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java
b/src/java/org/apache/cassandra/db/context/CounterContext.java
index 455ffc7..bb1 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -509,7 +509,7 @@ public class CounterContext
if (state.getElementInde
[jira] [Created] (CASSANDRA-7896) Running sstableupgrade in Cassandra 2.0.10 causes java.lang.OutOfMemoryError: Java heap space
Ajay Vohra created CASSANDRA-7896: - Summary: Running sstableupgrade in Cassandra 2.0.10 causes java.lang.OutOfMemoryError: Java heap space Key: CASSANDRA-7896 URL: https://issues.apache.org/jira/browse/CASSANDRA-7896 Project: Cassandra Issue Type: Bug Components: Tools Environment: SUSE 11.3, Linux 2.6.34.10-0.6-desktop #1 SMP PREEMPT 2011-12-13 18:27:38 +0100 x86_64 x86_64 x86_64 GNU/Linux Reporter: Ajay Vohra Trying to upgrade Cassandra data from version 1.2.2 to 2.0.10. I took a snapshot from 1.2.2 version. I created the keyspace schema in 2.0.10 version and copied the 1.2.2 snapshot under it. I then run bin/sstableupgrade snapshot in version 2.0.10 and I get following error: Exception in thread "main" java.lang.OutOfMemoryError: Java heap space at java.util.ArrayList.(ArrayList.java:132) at org.apache.cassandra.db.RowIndexEntry$Serializer.deserialize(RowIndexEntry.java:120) at org.apache.cassandra.io.sstable.SSTableReader.buildSummary(SSTableReader.java:487) at org.apache.cassandra.io.sstable.SSTableReader.load(SSTableReader.java:455) at org.apache.cassandra.io.sstable.SSTableReader.load(SSTableReader.java:422) at org.apache.cassandra.io.sstable.SSTableReader.open(SSTableReader.java:203) at org.apache.cassandra.io.sstable.SSTableReader.openNoValidation(SSTableReader.java:155) at org.apache.cassandra.tools.StandaloneUpgrader.main(StandaloneUpgrader.java:82) I have tried increasing memory to 2 G but I get the same error. The largest data file is of size 1275248. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7895:
---
Priority: Minor (was: Major)
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>Priority: Minor
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Assigned] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura reassigned CASSANDRA-7895:
--
Assignee: Mikhail Stepura
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>Assignee: Mikhail Stepura
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-7895) ALTER TYPE RENAME TO no longer parses as valid cql
[
https://issues.apache.org/jira/browse/CASSANDRA-7895?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14124395#comment-14124395
]
Sylvain Lebresne commented on CASSANDRA-7895:
-
We've removed type renames for now (CASSANDRA-6940, but it's possible the cqlsh
completion needs to be updated) so the error message of the description is
correct. We do still support renaming fields inside a type though.
> ALTER TYPE RENAME TO no longer parses as valid cql
>
>
> Key: CASSANDRA-7895
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7895
> Project: Cassandra
> Issue Type: Bug
>Reporter: Russ Hatch
>
> Type renaming seems to be broken. The error looks like perhaps the syntax has
> changed or there's a problem parsing the cql.
> {noformat}
> cqlsh:test> create type foo (somefield int);
> cqlsh:test> alter type foo rename to bar;
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
