Updated Branches: refs/heads/cassandra-1.2 0beab74df -> 71afb93d9
Remove commented code Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71afb93d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71afb93d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71afb93d Branch: refs/heads/cassandra-1.2 Commit: 71afb93d9a7862705914cd0420cfda8f23c83797 Parents: 0beab74 Author: Sylvain Lebresne <[email protected]> Authored: Fri Jul 12 17:17:05 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Jul 12 17:17:05 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/filter/ColumnSlice.java | 36 -------------------- 1 file changed, 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71afb93d/src/java/org/apache/cassandra/db/filter/ColumnSlice.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java index 208e181..1677ea1 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java @@ -47,42 +47,6 @@ public class ColumnSlice this.finish = finish; } - /** - * Validate an array of column slices. - * To be valid, the slices must be sorted and non-overlapping and each slice must be valid. - * - * @throws IllegalArgumentException if the input slices are not valid. - */ - //public static void validate(ColumnSlice[] slices, AbstractType<?> comparator, boolean reversed) - //{ - // for (int i = 0; i < slices.length; i++) - // { - // ColumnSlice slice = slices[i]; - // validate(slice, comparator, reversed); - // if (i > 0) - // { - // if (slices[i - 1].finish.remaining() == 0 || slice.start.remaining() == 0) - // throw new IllegalArgumentException("Invalid column slices: slices must be sorted and non-overlapping"); - - // int cmp = comparator.compare(slices[i -1].finish, slice.start); - // if (reversed ? cmp <= 0 : cmp >= 0) - // throw new IllegalArgumentException("Invalid column slices: slices must be sorted and non-overlapping"); - // } - // } - //} - - /** - * Validate a column slices. - * To be valid, the slice start must sort before the slice end. - * - * @throws IllegalArgumentException if the slice is not valid. - */ - //public static void validate(ColumnSlice slice, AbstractType<?> comparator, boolean reversed) - //{ - // if (slice.isAlwaysEmpty(comparator, reversed)) - // throw new IllegalArgumentException("Slice finish must come after start in traversal order"); - //} - public boolean isAlwaysEmpty(AbstractType<?> comparator, boolean reversed) { Comparator<ByteBuffer> orderedComparator = reversed ? comparator.reverseComparator : comparator;
