cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [23/25] git commit: fix type in CQL3 ALTER TABLE
Date Tue, 24 Apr 2012 18:12:37 GMT
fix type in CQL3 ALTER TABLE

patch by slebresne; reviewed by jbellis for CASSANDRA-4170


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17e3cc42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e3cc42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e3cc42

Branch: refs/heads/cassandra-1.1
Commit: 17e3cc42e0f5ec2096a6909f131266121f494ffd
Parents: 189e133
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Apr 20 17:24:02 2012 +0200
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 24 13:11:21 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cql3/statements/AlterTableStatement.java       |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e3cc42/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a491be..9392d3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
  * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065)
  * Allow KS and CF names up to 48 characters (CASSANDRA-4157)
  * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
+ * Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170)
 Merged from 1.0:
  * avoid streaming empty files with bulk loader if sstablewriter errors out
    (CASSANDRA-3946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e3cc42/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 37db2fd..bb2c7e8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -98,7 +98,7 @@ public class AlterTableStatement extends SchemaAlteringStatement
                         cfm.defaultValidator(CFPropDefs.parseType(validator));
                         break;
                     case COLUMN_METADATA:
-                        ColumnDefinition column = meta.getColumnDefinition(columnName.key);
+                        ColumnDefinition column = cfm.getColumnDefinition(columnName.key);
                         column.setValidator(CFPropDefs.parseType(validator));
                         cfm.addColumnDefinition(column);
                         break;


Mime
View raw message