git commit: Reject counters inside user types
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 85b743827 - fb3995ae1 Reject counters inside user types patch by Aleksey Yeschenko; tested by Russ Hatch; reviewed by Jonathan Ellis for CASSANDRA-7672 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb3995ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb3995ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb3995ae Branch: refs/heads/cassandra-2.1.0 Commit: fb3995ae13683de598624f2d689e1fb2d88d51bf Parents: 85b7438 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:40:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:40:00 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index f4b3921..eaa3b43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java -- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java index 1ddc8e6..5224474 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java @@ -68,8 +68,13 @@ public class CreateTypeStatement extends SchemaAlteringStatement KSMetaData ksm = Schema.instance.getKSMetaData(name.getKeyspace()); if (ksm == null) throw new InvalidRequestException(String.format(Cannot add type in unknown keyspace %s, name.getKeyspace())); + if (ksm.userTypes.getType(name.getUserTypeName()) != null !ifNotExists) -throw new InvalidRequestException(String.format(A user type of name %s already exists., name)); +throw new InvalidRequestException(String.format(A user type of name %s already exists, name)); + +for (CQL3Type.Raw type : columnTypes) +if (type.isCounter()) +throw new InvalidRequestException(A user type cannot contain counters); } public static void checkForDuplicateNames(UserType type) throws InvalidRequestException
[3/3] 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/4e4761cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e4761cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e4761cc Branch: refs/heads/trunk Commit: 4e4761ccbc12bcc248c17cfcf6b1a602c038b4a4 Parents: a4e8e16 b2218d0 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:41:36 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:41:36 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e4761cc/CHANGES.txt --
[1/2] git commit: Reject counters inside user types
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 63d1d2968 - b2218d0d8 Reject counters inside user types patch by Aleksey Yeschenko; tested by Russ Hatch; reviewed by Jonathan Ellis for CASSANDRA-7672 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb3995ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb3995ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb3995ae Branch: refs/heads/cassandra-2.1 Commit: fb3995ae13683de598624f2d689e1fb2d88d51bf Parents: 85b7438 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:40:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:40:00 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index f4b3921..eaa3b43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java -- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java index 1ddc8e6..5224474 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java @@ -68,8 +68,13 @@ public class CreateTypeStatement extends SchemaAlteringStatement KSMetaData ksm = Schema.instance.getKSMetaData(name.getKeyspace()); if (ksm == null) throw new InvalidRequestException(String.format(Cannot add type in unknown keyspace %s, name.getKeyspace())); + if (ksm.userTypes.getType(name.getUserTypeName()) != null !ifNotExists) -throw new InvalidRequestException(String.format(A user type of name %s already exists., name)); +throw new InvalidRequestException(String.format(A user type of name %s already exists, name)); + +for (CQL3Type.Raw type : columnTypes) +if (type.isCounter()) +throw new InvalidRequestException(A user type cannot contain counters); } public static void checkForDuplicateNames(UserType type) throws InvalidRequestException
[2/2] 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/b2218d0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2218d0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2218d0d Branch: refs/heads/cassandra-2.1 Commit: b2218d0d824407b6760320d03b1751b52afc00d7 Parents: 63d1d29 fb3995a Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:41:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:41:11 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2218d0d/CHANGES.txt -- diff --cc CHANGES.txt index c39490a,eaa3b43..c76b310 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568)
[2/3] 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/b2218d0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2218d0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2218d0d Branch: refs/heads/trunk Commit: b2218d0d824407b6760320d03b1751b52afc00d7 Parents: 63d1d29 fb3995a Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:41:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:41:11 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2218d0d/CHANGES.txt -- diff --cc CHANGES.txt index c39490a,eaa3b43..c76b310 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568)
[1/3] git commit: Reject counters inside user types
Repository: cassandra Updated Branches: refs/heads/trunk a4e8e1656 - 4e4761ccb Reject counters inside user types patch by Aleksey Yeschenko; tested by Russ Hatch; reviewed by Jonathan Ellis for CASSANDRA-7672 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb3995ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb3995ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb3995ae Branch: refs/heads/trunk Commit: fb3995ae13683de598624f2d689e1fb2d88d51bf Parents: 85b7438 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:40:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:40:00 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index f4b3921..eaa3b43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb3995ae/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java -- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java index 1ddc8e6..5224474 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java @@ -68,8 +68,13 @@ public class CreateTypeStatement extends SchemaAlteringStatement KSMetaData ksm = Schema.instance.getKSMetaData(name.getKeyspace()); if (ksm == null) throw new InvalidRequestException(String.format(Cannot add type in unknown keyspace %s, name.getKeyspace())); + if (ksm.userTypes.getType(name.getUserTypeName()) != null !ifNotExists) -throw new InvalidRequestException(String.format(A user type of name %s already exists., name)); +throw new InvalidRequestException(String.format(A user type of name %s already exists, name)); + +for (CQL3Type.Raw type : columnTypes) +if (type.isCounter()) +throw new InvalidRequestException(A user type cannot contain counters); } public static void checkForDuplicateNames(UserType type) throws InvalidRequestException
git commit: Update versions for 2.1.0-rc5 release
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 fb3995ae1 - cfb335e39 Update versions for 2.1.0-rc5 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb335e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb335e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb335e3 Branch: refs/heads/cassandra-2.1.0 Commit: cfb335e39b080c031faf76671c67cc003af22635 Parents: fb3995a Author: Sylvain Lebresne sylv...@datastax.com Authored: Sat Aug 2 13:48:00 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Sat Aug 2 13:48:00 2014 +0200 -- build.xml | 2 +- debian/changelog | 6 ++ .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 3 files changed, 24 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/build.xml -- diff --git a/build.xml b/build.xml index ca973cc..52c5158 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ property name=debuglevel value=source,lines,vars/ !-- default version and SCM information -- -property name=base.version value=2.1.0-rc4/ +property name=base.version value=2.1.0-rc5/ property name=scm.connection value=scm:git://git.apache.org/cassandra.git/ property name=scm.developerConnection value=scm:git://git.apache.org/cassandra.git/ property name=scm.url value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/ http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/debian/changelog -- diff --git a/debian/changelog b/debian/changelog index 7a38d2d..03e308e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~rc5) unstable; urgency=medium + + * New RC release + + -- Sylvain Lebresne slebre...@apache.org Sat, 02 Aug 2014 13:45:54 +0200 + cassandra (2.1.0~rc4) unstable; urgency=medium * New RC release http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java -- diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java index b386026..e27f968 100644 --- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java @@ -1,3 +1,20 @@ +/* + * 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. + */ package org.apache.cassandra.cql3; import org.junit.Test;
Git Push Summary
Repository: cassandra Updated Tags: refs/tags/2.1.0-rc5-tentative [created] cfb335e39
[jira] [Commented] (CASSANDRA-7635) Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
[
https://issues.apache.org/jira/browse/CASSANDRA-7635?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14083546#comment-14083546
]
Lyuben Todorov commented on CASSANDRA-7635:
---
{{hinted_handoff_throttle_delay_in_ms}} is gone from cassandra.yaml since 1.1,
not sure why the fixver is targeting 2.0.10. I can post a patch for 1.1 but do
we want to modify that branch so late on? P.S. will update fix version to 1.1.x
Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
--
Key: CASSANDRA-7635
URL: https://issues.apache.org/jira/browse/CASSANDRA-7635
Project: Cassandra
Issue Type: Improvement
Components: Tools
Reporter: Matt Stump
Assignee: Lyuben Todorov
Priority: Minor
Fix For: 1.1.12
Transfer of stored hints can peg the CPU of the node performing the sending
of the hints. We have a throttle hinted_handoff_throttle_delay_in_ms, but
it requires a restart. It would be helpful if this were configurable via
nodetool to avoid the reboot.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-7635) Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
[ https://issues.apache.org/jira/browse/CASSANDRA-7635?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Lyuben Todorov updated CASSANDRA-7635: -- Fix Version/s: (was: 2.0.10) 1.1.12 Make hinted_handoff_throttle_delay_in_ms configurable via nodetool -- Key: CASSANDRA-7635 URL: https://issues.apache.org/jira/browse/CASSANDRA-7635 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Matt Stump Assignee: Lyuben Todorov Priority: Minor Fix For: 1.1.12 Transfer of stored hints can peg the CPU of the node performing the sending of the hints. We have a throttle hinted_handoff_throttle_delay_in_ms, but it requires a restart. It would be helpful if this were configurable via nodetool to avoid the reboot. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7635) Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
[
https://issues.apache.org/jira/browse/CASSANDRA-7635?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14083549#comment-14083549
]
Lyuben Todorov commented on CASSANDRA-7635:
---
On the other hand we can expose the {{hinted_handoff_throttle_in_kb}} throttle
via JMX since it seems like it is what superseded the time based delay.
Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
--
Key: CASSANDRA-7635
URL: https://issues.apache.org/jira/browse/CASSANDRA-7635
Project: Cassandra
Issue Type: Improvement
Components: Tools
Reporter: Matt Stump
Assignee: Lyuben Todorov
Priority: Minor
Fix For: 1.1.12
Transfer of stored hints can peg the CPU of the node performing the sending
of the hints. We have a throttle hinted_handoff_throttle_delay_in_ms, but
it requires a restart. It would be helpful if this were configurable via
nodetool to avoid the reboot.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-7635) Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
[ https://issues.apache.org/jira/browse/CASSANDRA-7635?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Lyuben Todorov updated CASSANDRA-7635: -- Fix Version/s: (was: 1.1.12) 2.0.10 Make hinted_handoff_throttle_delay_in_ms configurable via nodetool -- Key: CASSANDRA-7635 URL: https://issues.apache.org/jira/browse/CASSANDRA-7635 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Matt Stump Assignee: Lyuben Todorov Priority: Minor Fix For: 2.0.10 Transfer of stored hints can peg the CPU of the node performing the sending of the hints. We have a throttle hinted_handoff_throttle_delay_in_ms, but it requires a restart. It would be helpful if this were configurable via nodetool to avoid the reboot. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7635) Make hinted_handoff_throttle_delay_in_ms configurable via nodetool
[ https://issues.apache.org/jira/browse/CASSANDRA-7635?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Lyuben Todorov updated CASSANDRA-7635: -- Attachment: cassandra-2.0-7635.diff Make hinted_handoff_throttle_delay_in_ms configurable via nodetool -- Key: CASSANDRA-7635 URL: https://issues.apache.org/jira/browse/CASSANDRA-7635 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Matt Stump Assignee: Lyuben Todorov Priority: Minor Fix For: 2.0.10 Attachments: cassandra-2.0-7635.diff Transfer of stored hints can peg the CPU of the node performing the sending of the hints. We have a throttle hinted_handoff_throttle_delay_in_ms, but it requires a restart. It would be helpful if this were configurable via nodetool to avoid the reboot. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7670) selecting field from empty UDT cell using dot notation triggers exception
[
https://issues.apache.org/jira/browse/CASSANDRA-7670?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7670:
---
Attachment: CASSANDRA-2.1.0-7670.patch
We can check the value for null before splitting it, attaching a patch for that
selecting field from empty UDT cell using dot notation triggers exception
-
Key: CASSANDRA-7670
URL: https://issues.apache.org/jira/browse/CASSANDRA-7670
Project: Cassandra
Issue Type: Bug
Reporter: Russ Hatch
Assignee: Sylvain Lebresne
Priority: Minor
Fix For: 2.1.1
Attachments: CASSANDRA-2.1.0-7670.patch
Hopefully the title explains the issue.
Basically if a row has a user type which is undefined, using the dot
notation syntax causes cqlsh to show a NPE, and an exception ends up in the
log as well.
I would expect the behavior here to execute the query and return null, since
the user type itself is null, then it's fields are null as well (the downside
here is there would be no way to distinguish between a null UDT and a null
UDT field, without making an initial query to check if the UDT is non-null).
Steps to repro:
{noformat}
create keyspace test with replication = {'class':'SimpleStrategy',
'replication_factor':1};
use test;
CREATE TYPE t_item (subitem text);
create table mytable (value1 text PRIMARY KEY, value2 text, item t_item);
insert into mytable (value1, value2 ) values ('foo', 'bar');
select item.subitem from mytable;
ErrorMessage code= [Server error]
message=java.lang.NullPointerException
{noformat}
Here's the exception logged:
{noformat}
ERROR [SharedPool-Worker-1] 2014-08-01 15:49:00,514 ErrorMessage.java:218 -
Unexpected exception during request
java.lang.NullPointerException: null
at
org.apache.cassandra.db.marshal.TupleType.split(TupleType.java:146)
~[main/:na]
at
org.apache.cassandra.cql3.statements.Selection$FieldSelector.compute(Selection.java:469)
~[main/:na]
at
org.apache.cassandra.cql3.statements.Selection$SelectionWithFunctions.handleRow(Selection.java:537)
~[main/:na]
at
org.apache.cassandra.cql3.statements.Selection$ResultSetBuilder.build(Selection.java:333)
~[main/:na]
at
org.apache.cassandra.cql3.statements.SelectStatement.process(SelectStatement.java:1149)
~[main/:na]
at
org.apache.cassandra.cql3.statements.SelectStatement.processResults(SelectStatement.java:283)
~[main/:na]
at
org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:225)
~[main/:na]
at
org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:60)
~[main/:na]
at
org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:187)
~[main/:na]
at
org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:206)
~[main/:na]
at
org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:118)
~[main/:na]
at
org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:421)
[main/:na]
at
org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:318)
[main/:na]
at
io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:103)
[netty-all-4.0.20.Final.jar:4.0.20.Final]
at
io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:332)
[netty-all-4.0.20.Final.jar:4.0.20.Final]
at
io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:31)
[netty-all-4.0.20.Final.jar:4.0.20.Final]
at
io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:323)
[netty-all-4.0.20.Final.jar:4.0.20.Final]
at
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
[na:1.7.0_65]
at
org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:163)
[main/:na]
at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:103)
[main/:na]
at java.lang.Thread.run(Thread.java:745) [na:1.7.0_65]
{noformat}
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-7673) Update cqlsh tests to support new colored output
[ https://issues.apache.org/jira/browse/CASSANDRA-7673?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7673: --- Priority: Minor (was: Major) Update cqlsh tests to support new colored output Key: CASSANDRA-7673 URL: https://issues.apache.org/jira/browse/CASSANDRA-7673 Project: Cassandra Issue Type: Sub-task Components: Tools Reporter: Mikhail Stepura Priority: Minor Labels: cqlsh Fix For: 2.1.1 CASSANDRA-6910 introduces different coloring for partition (red) and clustering keys (cyan), but test cases still expect default color (magenta) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7673) Update cqlsh tests to support new colored output
[ https://issues.apache.org/jira/browse/CASSANDRA-7673?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7673: --- Labels: cqlsh (was: ) Update cqlsh tests to support new colored output Key: CASSANDRA-7673 URL: https://issues.apache.org/jira/browse/CASSANDRA-7673 Project: Cassandra Issue Type: Sub-task Components: Tools Reporter: Mikhail Stepura Priority: Minor Labels: cqlsh Fix For: 2.1.1 CASSANDRA-6910 introduces different coloring for partition (red) and clustering keys (cyan), but test cases still expect default color (magenta) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7673) Update cqlsh tests to support new colored output
Mikhail Stepura created CASSANDRA-7673: -- Summary: Update cqlsh tests to support new colored output Key: CASSANDRA-7673 URL: https://issues.apache.org/jira/browse/CASSANDRA-7673 Project: Cassandra Issue Type: Sub-task Reporter: Mikhail Stepura Fix For: 2.1.1 CASSANDRA-6910 introduces different coloring for partition (red) and clustering keys (cyan), but test cases still expect default color (magenta) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7524) cqlsh fails when version number parts are not int
[
https://issues.apache.org/jira/browse/CASSANDRA-7524?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mikhail Stepura updated CASSANDRA-7524:
---
Attachment: CASSANDRA-2.1-7524.patch
I've found no usages of {{cass_ver_tuple}} in the cqlsh, so it easier just to
remove that unused code.
Attaching a patch for that
cqlsh fails when version number parts are not int
-
Key: CASSANDRA-7524
URL: https://issues.apache.org/jira/browse/CASSANDRA-7524
Project: Cassandra
Issue Type: Bug
Components: Tools
Reporter: Alexander Bulaev
Assignee: Mikhail Stepura
Priority: Trivial
Labels: cqlsh
Fix For: 2.1.1
Attachments: CASSANDRA-2.1-7524.patch
{code}
alexbool@gibson ~ cqlsh
Traceback (most recent call last):
File /usr/bin/cqlsh, line 1894, in module
main(*read_options(sys.argv[1:], os.environ))
File /usr/bin/cqlsh, line 1877, in main
single_statement=options.execute)
File /usr/bin/cqlsh, line 496, in __init__
self.get_connection_versions()
File /usr/bin/cqlsh, line 595, in get_connection_versions
self.cass_ver_tuple = tuple(map(int, vers['build'].split('-',
1)[0].split('.')[:3]))
ValueError: invalid literal for int() with base 10: '0~rc2'
{code}
I used cassandra 2.1-rc2 debs from Apache repository
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Reopened] (CASSANDRA-7663) Removing a seed causes previously removed seeds to reappear
[ https://issues.apache.org/jira/browse/CASSANDRA-7663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams reopened CASSANDRA-7663: - Removing a seed causes previously removed seeds to reappear --- Key: CASSANDRA-7663 URL: https://issues.apache.org/jira/browse/CASSANDRA-7663 Project: Cassandra Issue Type: Bug Reporter: Richard Low Assignee: Brandon Williams Fix For: 1.2.19, 2.0.10, 2.1.0 Attachments: 7663.txt When you remove a seed from a cluster, Gossiper.removeEndpoint ensures it is removed from the seed list. However, it also resets the seed list to be the original list, which would bring back any previously removed seeds. What is the reasoning for having the call to buildSeedsList()? If it wasn’t there then I think the problem would be solved. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7663) Removing a seed causes previously removed seeds to reappear
[ https://issues.apache.org/jira/browse/CASSANDRA-7663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-7663: Attachment: 7663-v2.txt I think it's definitely a Bad Idea to forcibly yank things from Cassandra's classpath, especially since if you do you get this bug, but here's a patch that can tolerate it. Removing a seed causes previously removed seeds to reappear --- Key: CASSANDRA-7663 URL: https://issues.apache.org/jira/browse/CASSANDRA-7663 Project: Cassandra Issue Type: Bug Reporter: Richard Low Assignee: Brandon Williams Fix For: 1.2.19, 2.0.10, 2.1.0 Attachments: 7663-v2.txt, 7663.txt When you remove a seed from a cluster, Gossiper.removeEndpoint ensures it is removed from the seed list. However, it also resets the seed list to be the original list, which would bring back any previously removed seeds. What is the reasoning for having the call to buildSeedsList()? If it wasn’t there then I think the problem would be solved. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7663) Removing a seed causes previously removed seeds to reappear
[ https://issues.apache.org/jira/browse/CASSANDRA-7663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-7663: -- Reviewer: Richard Low (was: Jonathan Ellis) Removing a seed causes previously removed seeds to reappear --- Key: CASSANDRA-7663 URL: https://issues.apache.org/jira/browse/CASSANDRA-7663 Project: Cassandra Issue Type: Bug Reporter: Richard Low Assignee: Brandon Williams Fix For: 1.2.19, 2.0.10, 2.1.0 Attachments: 7663-v2.txt, 7663.txt When you remove a seed from a cluster, Gossiper.removeEndpoint ensures it is removed from the seed list. However, it also resets the seed list to be the original list, which would bring back any previously removed seeds. What is the reasoning for having the call to buildSeedsList()? If it wasn’t there then I think the problem would be solved. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7524) cqlsh fails when version number parts are not int
[
https://issues.apache.org/jira/browse/CASSANDRA-7524?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14083654#comment-14083654
]
Jonathan Ellis commented on CASSANDRA-7524:
---
+1
cqlsh fails when version number parts are not int
-
Key: CASSANDRA-7524
URL: https://issues.apache.org/jira/browse/CASSANDRA-7524
Project: Cassandra
Issue Type: Bug
Components: Tools
Reporter: Alexander Bulaev
Assignee: Mikhail Stepura
Priority: Trivial
Labels: cqlsh
Fix For: 2.1.1
Attachments: CASSANDRA-2.1-7524.patch
{code}
alexbool@gibson ~ cqlsh
Traceback (most recent call last):
File /usr/bin/cqlsh, line 1894, in module
main(*read_options(sys.argv[1:], os.environ))
File /usr/bin/cqlsh, line 1877, in main
single_statement=options.execute)
File /usr/bin/cqlsh, line 496, in __init__
self.get_connection_versions()
File /usr/bin/cqlsh, line 595, in get_connection_versions
self.cass_ver_tuple = tuple(map(int, vers['build'].split('-',
1)[0].split('.')[:3]))
ValueError: invalid literal for int() with base 10: '0~rc2'
{code}
I used cassandra 2.1-rc2 debs from Apache repository
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[1/3] git commit: (cqlsh) Removed unused code for build number parsing
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 b2218d0d8 - 6b34d46c6
refs/heads/trunk 4e4761ccb - be6cf8a32
(cqlsh) Removed unused code for build number parsing
patch by Mikhail Stepura; reviewed by Jonathan Ellis for CASSANDRA-7524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b34d46c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b34d46c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b34d46c
Branch: refs/heads/cassandra-2.1
Commit: 6b34d46c631700055b2d6629a671e23d91e46946
Parents: b2218d0
Author: Mikhail Stepura mish...@apache.org
Authored: Sat Aug 2 09:18:46 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Sat Aug 2 17:08:18 2014 -0700
--
CHANGES.txt | 1 +
bin/cqlsh | 4
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c76b310..24d3d50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
Merged from 2.0:
* (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
* Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
2.1.0-final
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 00e46b5..18db842 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -572,9 +572,6 @@ class Shell(cmd.Cmd):
def cqlver_atleast(self, major, minor=0, patch=0):
return self.cql_ver_tuple[:3] = (major, minor, patch)
-def cassandraver_atleast(self, major, minor=0, patch=0):
-return self.cass_ver_tuple[:3] = (major, minor, patch)
-
def myformat_value(self, val, **kwargs):
if isinstance(val, DecodeError):
self.decoding_errors.append(val)
@@ -625,7 +622,6 @@ class Shell(cmd.Cmd):
'cql': result.cql_version,
}
self.connection_versions = vers
-self.cass_ver_tuple = tuple(map(int, vers['build'].split('-',
1)[0].split('.')[:3]))
def get_keyspace_names(self):
return map(str, self.conn.metadata.keyspaces.keys())
[2/3] git commit: (cqlsh) Removed unused code for build number parsing
(cqlsh) Removed unused code for build number parsing
patch by Mikhail Stepura; reviewed by Jonathan Ellis for CASSANDRA-7524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b34d46c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b34d46c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b34d46c
Branch: refs/heads/trunk
Commit: 6b34d46c631700055b2d6629a671e23d91e46946
Parents: b2218d0
Author: Mikhail Stepura mish...@apache.org
Authored: Sat Aug 2 09:18:46 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Sat Aug 2 17:08:18 2014 -0700
--
CHANGES.txt | 1 +
bin/cqlsh | 4
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c76b310..24d3d50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
Merged from 2.0:
* (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
* Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
2.1.0-final
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 00e46b5..18db842 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -572,9 +572,6 @@ class Shell(cmd.Cmd):
def cqlver_atleast(self, major, minor=0, patch=0):
return self.cql_ver_tuple[:3] = (major, minor, patch)
-def cassandraver_atleast(self, major, minor=0, patch=0):
-return self.cass_ver_tuple[:3] = (major, minor, patch)
-
def myformat_value(self, val, **kwargs):
if isinstance(val, DecodeError):
self.decoding_errors.append(val)
@@ -625,7 +622,6 @@ class Shell(cmd.Cmd):
'cql': result.cql_version,
}
self.connection_versions = vers
-self.cass_ver_tuple = tuple(map(int, vers['build'].split('-',
1)[0].split('.')[:3]))
def get_keyspace_names(self):
return map(str, self.conn.metadata.keyspaces.keys())
[3/3] 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/be6cf8a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be6cf8a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be6cf8a3 Branch: refs/heads/trunk Commit: be6cf8a32594168dcff14d9a68ba6e060691066d Parents: 4e4761c 6b34d46 Author: Mikhail Stepura mish...@apache.org Authored: Sat Aug 2 17:09:11 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Sat Aug 2 17:09:11 2014 -0700 -- CHANGES.txt | 1 + bin/cqlsh | 4 2 files changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be6cf8a3/CHANGES.txt --
git commit: simplify charset handling
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 cfb335e39 - 57abab1f2
simplify charset handling
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57abab1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57abab1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57abab1f
Branch: refs/heads/cassandra-2.1.0
Commit: 57abab1f2551fb5e3792bc9f3828af3c04d52636
Parents: cfb335e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Aug 3 00:25:14 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Aug 3 00:25:14 2014 -0400
--
src/java/org/apache/cassandra/thrift/CassandraServer.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57abab1f/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 86b5bee..4edb64d 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
@@ -1875,7 +1876,7 @@ public class CassandraServer implements Cassandra.Iface
decompressor.end();
-queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), UTF-8);
+queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), StandardCharsets.UTF_8);
break;
case NONE:
try
@@ -1893,10 +1894,6 @@ public class CassandraServer implements Cassandra.Iface
{
throw new InvalidRequestException(Error deflating query string.);
}
-catch (UnsupportedEncodingException e)
-{
-throw new InvalidRequestException(Unknown query string
encoding.);
-}
return queryString;
}
[3/3] 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/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d06dd10 Branch: refs/heads/cassandra-2.1 Commit: 8d06dd102dd3b119cd1f74a88813c4e6c72e453d Parents: 6b34d46 57abab1 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Aug 3 00:39:59 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Aug 3 00:39:59 2014 -0400 -- build.xml | 2 +- debian/changelog | 6 ++ .../apache/cassandra/thrift/CassandraServer.java | 7 ++- .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 4 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/build.xml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[1/3] git commit: Update versions for 2.1.0-rc5 release
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6b34d46c6 - 8d06dd102 Update versions for 2.1.0-rc5 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb335e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb335e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb335e3 Branch: refs/heads/cassandra-2.1 Commit: cfb335e39b080c031faf76671c67cc003af22635 Parents: fb3995a Author: Sylvain Lebresne sylv...@datastax.com Authored: Sat Aug 2 13:48:00 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Sat Aug 2 13:48:00 2014 +0200 -- build.xml | 2 +- debian/changelog | 6 ++ .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 3 files changed, 24 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/build.xml -- diff --git a/build.xml b/build.xml index ca973cc..52c5158 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ property name=debuglevel value=source,lines,vars/ !-- default version and SCM information -- -property name=base.version value=2.1.0-rc4/ +property name=base.version value=2.1.0-rc5/ property name=scm.connection value=scm:git://git.apache.org/cassandra.git/ property name=scm.developerConnection value=scm:git://git.apache.org/cassandra.git/ property name=scm.url value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/ http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/debian/changelog -- diff --git a/debian/changelog b/debian/changelog index 7a38d2d..03e308e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~rc5) unstable; urgency=medium + + * New RC release + + -- Sylvain Lebresne slebre...@apache.org Sat, 02 Aug 2014 13:45:54 +0200 + cassandra (2.1.0~rc4) unstable; urgency=medium * New RC release http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java -- diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java index b386026..e27f968 100644 --- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java @@ -1,3 +1,20 @@ +/* + * 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. + */ package org.apache.cassandra.cql3; import org.junit.Test;
[2/3] git commit: simplify charset handling
simplify charset handling
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57abab1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57abab1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57abab1f
Branch: refs/heads/cassandra-2.1
Commit: 57abab1f2551fb5e3792bc9f3828af3c04d52636
Parents: cfb335e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Aug 3 00:25:14 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Aug 3 00:25:14 2014 -0400
--
src/java/org/apache/cassandra/thrift/CassandraServer.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57abab1f/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 86b5bee..4edb64d 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
@@ -1875,7 +1876,7 @@ public class CassandraServer implements Cassandra.Iface
decompressor.end();
-queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), UTF-8);
+queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), StandardCharsets.UTF_8);
break;
case NONE:
try
@@ -1893,10 +1894,6 @@ public class CassandraServer implements Cassandra.Iface
{
throw new InvalidRequestException(Error deflating query string.);
}
-catch (UnsupportedEncodingException e)
-{
-throw new InvalidRequestException(Unknown query string
encoding.);
-}
return queryString;
}
[4/4] 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/d6f3cdf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6f3cdf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6f3cdf6 Branch: refs/heads/trunk Commit: d6f3cdf6ff38fcd301098a91d32bb2b4b47d2df0 Parents: be6cf8a 8d06dd1 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Aug 3 00:45:48 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Aug 3 00:45:48 2014 -0400 -- build.xml | 2 +- debian/changelog | 6 ++ .../apache/cassandra/thrift/CassandraServer.java | 7 ++- .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 4 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6f3cdf6/build.xml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6f3cdf6/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[2/4] git commit: simplify charset handling
simplify charset handling
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57abab1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57abab1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57abab1f
Branch: refs/heads/trunk
Commit: 57abab1f2551fb5e3792bc9f3828af3c04d52636
Parents: cfb335e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Aug 3 00:25:14 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Aug 3 00:25:14 2014 -0400
--
src/java/org/apache/cassandra/thrift/CassandraServer.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57abab1f/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 86b5bee..4edb64d 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
@@ -1875,7 +1876,7 @@ public class CassandraServer implements Cassandra.Iface
decompressor.end();
-queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), UTF-8);
+queryString = new String(decompressed.getData(), 0,
decompressed.getLength(), StandardCharsets.UTF_8);
break;
case NONE:
try
@@ -1893,10 +1894,6 @@ public class CassandraServer implements Cassandra.Iface
{
throw new InvalidRequestException(Error deflating query string.);
}
-catch (UnsupportedEncodingException e)
-{
-throw new InvalidRequestException(Unknown query string
encoding.);
-}
return queryString;
}
[1/4] git commit: Update versions for 2.1.0-rc5 release
Repository: cassandra Updated Branches: refs/heads/trunk be6cf8a32 - d6f3cdf6f Update versions for 2.1.0-rc5 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb335e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb335e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb335e3 Branch: refs/heads/trunk Commit: cfb335e39b080c031faf76671c67cc003af22635 Parents: fb3995a Author: Sylvain Lebresne sylv...@datastax.com Authored: Sat Aug 2 13:48:00 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Sat Aug 2 13:48:00 2014 +0200 -- build.xml | 2 +- debian/changelog | 6 ++ .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 3 files changed, 24 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/build.xml -- diff --git a/build.xml b/build.xml index ca973cc..52c5158 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ property name=debuglevel value=source,lines,vars/ !-- default version and SCM information -- -property name=base.version value=2.1.0-rc4/ +property name=base.version value=2.1.0-rc5/ property name=scm.connection value=scm:git://git.apache.org/cassandra.git/ property name=scm.developerConnection value=scm:git://git.apache.org/cassandra.git/ property name=scm.url value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/ http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/debian/changelog -- diff --git a/debian/changelog b/debian/changelog index 7a38d2d..03e308e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~rc5) unstable; urgency=medium + + * New RC release + + -- Sylvain Lebresne slebre...@apache.org Sat, 02 Aug 2014 13:45:54 +0200 + cassandra (2.1.0~rc4) unstable; urgency=medium * New RC release http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java -- diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java index b386026..e27f968 100644 --- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java @@ -1,3 +1,20 @@ +/* + * 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. + */ package org.apache.cassandra.cql3; import org.junit.Test;
[3/4] 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/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d06dd10 Branch: refs/heads/trunk Commit: 8d06dd102dd3b119cd1f74a88813c4e6c72e453d Parents: 6b34d46 57abab1 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Aug 3 00:39:59 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Aug 3 00:39:59 2014 -0400 -- build.xml | 2 +- debian/changelog | 6 ++ .../apache/cassandra/thrift/CassandraServer.java | 7 ++- .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 4 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/build.xml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/src/java/org/apache/cassandra/thrift/CassandraServer.java --
