You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/01/05 21:00:29 UTC
[22/50] [abbrv] git commit: remove invalid assertion that table was
opened before dropping it patch by slebresne;
reviewed by jbellis for CASSANDRA-3580
remove invalid assertion that table was opened before dropping it
patch by slebresne; reviewed by jbellis for CASSANDRA-3580
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1212849 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70d37c9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d37c9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70d37c9e
Branch: refs/heads/cassandra-1.0
Commit: 70d37c9e69ad2fefa4c8a4d52761b409be076140
Parents: 27b733e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 10 19:17:44 2011 +0000
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 10 19:17:44 2011 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/db/migration/DropKeyspace.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/70d37c9e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 742767f..2bae579 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
0.8.9
+ * remove invalid assertion that table was opened before dropping it
+ (CASSANDRA-3580)
* range and index scans now only send requests to enough replicas to
satisfy requested CL + RR (CASSANDRA-3598)
* use cannonical host for local node in nodetool info (CASSANDRA-3556)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/70d37c9e/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/migration/DropKeyspace.java b/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
index f9a442e..7782bec 100644
--- a/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
+++ b/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
@@ -78,8 +78,7 @@ public class DropKeyspace extends Migration
}
// remove the table from the static instances.
- Table table = Table.clear(ksm.name);
- assert table != null;
+ Table.clear(ksm.name);
// reset defs.
DatabaseDescriptor.clearTableDefinition(ksm, newVersion);
}