You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/15 19:24:31 UTC
[1/2] git commit: Add missing table name to DROP INDEX responses
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8a2d8a138 -> 0b7377fed
Add missing table name to DROP INDEX responses
Patch and review by Tyler Hobbs and Aleksey Yeschenko for CASSANDRA-7539
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd0eafd5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd0eafd5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd0eafd5
Branch: refs/heads/cassandra-2.1
Commit: bd0eafd5853a446b0db79547231a0a9653a74293
Parents: 0401761
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 15 12:23:06 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 15 12:23:06 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/statements/DropIndexStatement.java | 11 +++++++++++
src/java/org/apache/cassandra/transport/Event.java | 2 ++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0eafd5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 193cff8..e6ded2a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
2.1.0-final
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
* Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0eafd5/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
index b8a4c9a..0562cc6 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
@@ -33,6 +33,9 @@ public class DropIndexStatement extends SchemaAlteringStatement
public final String indexName;
public final boolean ifExists;
+ // initialized in announceMigration()
+ private String indexedCF;
+
public DropIndexStatement(IndexName indexName, boolean ifExists)
{
super(indexName.getCfName());
@@ -67,6 +70,7 @@ public class DropIndexStatement extends SchemaAlteringStatement
return;
CFMetaData updatedCfm = updateCFMetadata(cfm);
+ indexedCF = updatedCfm.cfName;
MigrationManager.announceColumnFamilyUpdate(updatedCfm, false, isLocalOnly);
}
@@ -106,4 +110,11 @@ public class DropIndexStatement extends SchemaAlteringStatement
}
return null;
}
+
+ @Override
+ public String columnFamily()
+ {
+ assert indexedCF != null;
+ return indexedCF;
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0eafd5/src/java/org/apache/cassandra/transport/Event.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Event.java b/src/java/org/apache/cassandra/transport/Event.java
index 3fa2733..1b7e487 100644
--- a/src/java/org/apache/cassandra/transport/Event.java
+++ b/src/java/org/apache/cassandra/transport/Event.java
@@ -218,6 +218,8 @@ public abstract class Event
this.target = target;
this.keyspace = keyspace;
this.tableOrType = tableOrType;
+ if (target != Target.KEYSPACE)
+ assert this.tableOrType != null : "Table or type should be set for non-keyspace schema change events";
}
public SchemaChange(Change change, String keyspace)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
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/0b7377fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b7377fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b7377fe
Branch: refs/heads/cassandra-2.1
Commit: 0b7377fed597eb41bc23224c80747130561165cf
Parents: 8a2d8a1 bd0eafd
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 15 12:24:12 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 15 12:24:12 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/statements/DropIndexStatement.java | 11 +++++++++++
src/java/org/apache/cassandra/transport/Event.java | 2 ++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b7377fe/CHANGES.txt
----------------------------------------------------------------------