natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 1.2

This commit is contained in:
Jonathan Ellis 2013-08-08 17:08:14 -05:00
parent 5411e5ff85 73b0ffba82
commit d044fe6b15
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/cassandra/db/Column.java
View File

@ -302,16 +302,9 @@ public class Column implements OnDiskAtom
// 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;
}
ByteBuffer internalName = (cfdef.isComposite && !cfdef.isCompact)
? ((CompositeType) metadata.comparator).extractLastComponent(name)
: name;
AbstractType<?> valueValidator = metadata.getValueValidator(internalName);
if (valueValidator != null)