merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d044fe6b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d044fe6b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d044fe6b Branch: refs/heads/cassandra-2.0.0 Commit: d044fe6b155fa828b9e7f0477d47fd07ef0b5d17 Parents: 5411e5f 73b0ffb Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 17:08:14 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 17:08:14 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Column.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d044fe6b/src/java/org/apache/cassandra/db/Column.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/Column.java index d9e0416,632392f..b0d22fb --- a/src/java/org/apache/cassandra/db/Column.java +++ b/src/java/org/apache/cassandra/db/Column.java @@@ -302,16 -292,10 +302,9 @@@ public class Column implements OnDiskAt // If this is a CQL table, we need to pull out the CQL column name to look up the correct column type. // (Note that COMPACT composites are handled by validateName, above.) -- ByteBuffer internalName; - if (cfdef.isComposite && !cfdef.isCompact) - { - CompositeType comparator = (CompositeType) metadata.comparator; - internalName = comparator.extractLastComponent(name); - } - else - { - internalName = name; - } - internalName = (cfdef.isComposite && !cfdef.isCompact) - ? ((CompositeType) metadata.comparator).extractLastComponent(name) - : name; ++ ByteBuffer internalName = (cfdef.isComposite && !cfdef.isCompact) ++ ? ((CompositeType) metadata.comparator).extractLastComponent(name) ++ : name; AbstractType<?> valueValidator = metadata.getValueValidator(internalName); if (valueValidator != null)
