You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/06 12:02:26 UTC
[1/2] cassandra git commit: Correct IRE message in
DropTypeStatement::validate
Repository: cassandra
Updated Branches:
refs/heads/trunk 9280273f7 -> 2f7bab995
Correct IRE message in DropTypeStatement::validate
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc7e8405
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc7e8405
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc7e8405
Branch: refs/heads/trunk
Commit: dc7e8405bdc7fc26bb2eb3051d13f5d35c761ac8
Parents: 1e4d44e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 11:01:40 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 11:01:55 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/DropTypeStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc7e8405/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
index 74c8c36..d104b73 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
@@ -85,7 +85,7 @@ public class DropTypeStatement extends SchemaAlteringStatement
for (UserType ut : ksm.types)
if (!ut.name.equals(name.getUserTypeName()) && isUsedBy(ut))
- throw new InvalidRequestException(String.format("Cannot drop user type %s as it is still used by user type %s", name, ut.asCQL3Type()));
+ throw new InvalidRequestException(String.format("Cannot drop user type %s as it is still used by user type %s", name, ut.getNameAsString()));
for (CFMetaData cfm : ksm.tablesAndViews())
for (ColumnDefinition def : cfm.allColumns())
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f7bab99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f7bab99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f7bab99
Branch: refs/heads/trunk
Commit: 2f7bab995480611079c0c318b4d599239d5278cc
Parents: 9280273 dc7e840
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 11:02:23 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 11:02:23 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/DropTypeStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------