Updated Branches: refs/heads/trunk 36ef643e4 -> 15df6691c
replace assert+cast w/ checkedCast Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b48bd56e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48bd56e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48bd56e Branch: refs/heads/trunk Commit: b48bd56e78788f0cd20735fdb7d9bfcbfb999cf7 Parents: 36ef643 Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 24 06:41:22 2013 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 24 06:41:22 2013 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/RowIndexEntry.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48bd56e/src/java/org/apache/cassandra/db/RowIndexEntry.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java index 2819ae0..cfc7cf1 100644 --- a/src/java/org/apache/cassandra/db/RowIndexEntry.java +++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.google.common.primitives.Ints; + import org.apache.cassandra.cache.IMeasurableMemory; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.IndexHelper; @@ -181,8 +183,7 @@ public class RowIndexEntry implements IMeasurableMemory for (IndexHelper.IndexInfo info : columnsIndex) size += info.serializedSize(typeSizes); - assert size <= Integer.MAX_VALUE; - return (int)size; + return Ints.checkedCast(size); } @Override
