Updated Branches: refs/heads/trunk 4bc873b79 -> 70e318eaa
Fix using 'key' as primary key in CQL2 patch by slebresne; reviewed by yukim for CASSANDRA-4475 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70e318ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70e318ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70e318ea Branch: refs/heads/trunk Commit: 70e318eaa919d1824eb31738cf49b22bd2ea78fe Parents: 4bc873b Author: Sylvain Lebresne <[email protected]> Authored: Tue Jul 31 17:08:55 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jul 31 17:36:00 2012 +0200 ---------------------------------------------------------------------- .../cassandra/cql/CreateColumnFamilyStatement.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e318ea/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java index dd72eaf..4c86b6e 100644 --- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java @@ -177,12 +177,15 @@ public class CreateColumnFamilyStatement .maxCompactionThreshold(getPropertyInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD, CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD)) .columnMetadata(getColumns(comparator)) .keyValidator(TypeParser.parse(CFPropDefs.comparators.get(getKeyType()))) - .keyAliases(Collections.<ByteBuffer>singletonList(keyAlias)) .compactionStrategyClass(cfProps.compactionStrategyClass) .compactionStrategyOptions(cfProps.compactionStrategyOptions) .compressionParameters(CompressionParameters.create(cfProps.compressionParameters)) .caching(CFMetaData.Caching.fromString(getPropertyString(CFPropDefs.KW_CACHING, CFMetaData.DEFAULT_CACHING_STRATEGY.toString()))) .bloomFilterFpChance(getPropertyDouble(CFPropDefs.KW_BF_FP_CHANCE, CFMetaData.DEFAULT_BF_FP_CHANCE)); + + // CQL2 can have null keyAliases + if (keyAlias != null) + newCFMD.keyAliases(Collections.<ByteBuffer>singletonList(keyAlias)); } catch (ConfigurationException e) {
