Repository: cassandra Updated Branches: refs/heads/trunk 13ec86ce9 -> e93977310
Fix bug in counter mutation serialization patch by slebresne; reviewed by iamaleksey for CASSANDRA-10073 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df65a6c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df65a6c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df65a6c6 Branch: refs/heads/trunk Commit: df65a6c68a5d3f11121a6ebcbfbe9ef203d0078d Parents: 5726625 Author: Sylvain Lebresne <[email protected]> Authored: Sun Aug 16 18:05:11 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 17 15:03:52 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/ColumnSubselection.java | 3 ++- src/java/org/apache/cassandra/db/marshal/CollectionType.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df65a6c6/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java b/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java index e45dbee..b762fa5 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java @@ -180,8 +180,9 @@ public abstract class ColumnSubselection implements Comparable<ColumnSubselectio Element eltSelection = (Element)subSel; column.cellPathSerializer().serialize(eltSelection.element, out); break; + default: + throw new AssertionError(); } - throw new AssertionError(); } public ColumnSubselection deserialize(DataInputPlus in, int version, CFMetaData metadata) throws IOException http://git-wip-us.apache.org/repos/asf/cassandra/blob/df65a6c6/src/java/org/apache/cassandra/db/marshal/CollectionType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java b/src/java/org/apache/cassandra/db/marshal/CollectionType.java index 9a096d0..cc424b9 100644 --- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java +++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java @@ -127,7 +127,7 @@ public abstract class CollectionType<T> extends AbstractType<T> public void validateCellValue(ByteBuffer cellValue) throws MarshalException { if (isMultiCell()) - valueComparator().validate(cellValue); + valueComparator().validateCellValue(cellValue); else super.validateCellValue(cellValue); }
