Updated Branches: refs/heads/cassandra-1.1.0 36a9f9bd8 -> 6bc91392a
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/6bc91392 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bc91392 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bc91392 Branch: refs/heads/cassandra-1.1.0 Commit: 6bc91392a310f2d31d8942d1255ae9ac203aacc6 Parents: 36a9f9b Author: Sylvain Lebresne <[email protected]> Authored: Fri Apr 20 17:24:02 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Apr 20 17:24:02 2012 +0200 ---------------------------------------------------------------------- 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/6bc91392/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5e84e66..a0e5230 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,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/6bc91392/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;
