You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/01/10 02:05:01 UTC
[1/2] cassandra git commit: Include a Maps value type in
DropTypeStatement's isUsedBy patch by dbrosius reviewed by thobbs for
cassandra-8588
Repository: cassandra
Updated Branches:
refs/heads/trunk fa0cc9039 -> c04c50c95
Include a Maps value type in DropTypeStatement's isUsedBy
patch by dbrosius reviewed by thobbs for cassandra-8588
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53640838
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53640838
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53640838
Branch: refs/heads/trunk
Commit: 536408380aa07853bb8a4d4d96af1b0cd06bbe31
Parents: e906192
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 20:00:16 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 20:00:16 2015 -0500
----------------------------------------------------------------------
.../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/53640838/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 a3b82a4..94edd01 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
@@ -121,7 +121,7 @@ public class DropTypeStatement extends SchemaAlteringStatement
else if (toCheck instanceof SetType)
return isUsedBy(((SetType)toCheck).getElementsType());
else
- return isUsedBy(((MapType)toCheck).getKeysType()) || isUsedBy(((MapType)toCheck).getKeysType());
+ return isUsedBy(((MapType)toCheck).getKeysType()) || isUsedBy(((MapType)toCheck).getValuesType());
}
return false;
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
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/c04c50c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04c50c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04c50c9
Branch: refs/heads/trunk
Commit: c04c50c95baaf3be6c7069b3aa617a0a066cd792
Parents: fa0cc90 5364083
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 20:03:06 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 20:03:06 2015 -0500
----------------------------------------------------------------------
.../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/c04c50c9/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
----------------------------------------------------------------------