Repository: cassandra Updated Branches: refs/heads/trunk 48f644686 -> 1fab7b785
remove no-op casts Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fab7b78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fab7b78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fab7b78 Branch: refs/heads/trunk Commit: 1fab7b785dc5e440a773828ff17e927a1f3c2e5f Parents: 48f6446 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Apr 20 12:12:39 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Apr 20 12:12:39 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Tuples.java | 2 +- src/java/org/apache/cassandra/db/Memtable.java | 4 ++-- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../org/apache/cassandra/dht/Murmur3Partitioner.java | 4 ++-- src/java/org/apache/cassandra/dht/Range.java | 4 ++-- src/java/org/apache/cassandra/gms/Gossiper.java | 10 +++++----- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 2 +- .../apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- .../apache/cassandra/hadoop/pig/CassandraStorage.java | 14 +++++++------- .../org/apache/cassandra/metrics/RestorableMeter.java | 2 +- .../org/apache/cassandra/streaming/StreamManager.java | 4 ++-- .../org/apache/cassandra/tools/SSTableImport.java | 2 +- .../apache/cassandra/utils/FastByteOperations.java | 4 ++-- .../org/apache/cassandra/utils/HistogramBuilder.java | 2 +- src/java/org/apache/cassandra/utils/IntervalTree.java | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/cql3/Tuples.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Tuples.java b/src/java/org/apache/cassandra/cql3/Tuples.java index 92ccbce..89fecd0 100644 --- a/src/java/org/apache/cassandra/cql3/Tuples.java +++ b/src/java/org/apache/cassandra/cql3/Tuples.java @@ -259,7 +259,7 @@ public class Tuples { // Collections have this small hack that validate cannot be called on a serialized object, // but the deserialization does the validation (so we're fine). - List<?> l = (List<?>)type.getSerializer().deserializeForNativeProtocol(value, options.getProtocolVersion()); + List<?> l = type.getSerializer().deserializeForNativeProtocol(value, options.getProtocolVersion()); assert type.getElementsType() instanceof TupleType; TupleType tupleType = (TupleType) type.getElementsType(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 2381f26..aa5fb1b 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -414,10 +414,10 @@ public class Memtable ConcurrentNavigableMap<RowPosition, Object> rows = new ConcurrentSkipListMap<>(); final Object val = new Object(); for (int i = 0 ; i < count ; i++) - rows.put(allocator.clone(new BufferDecoratedKey(new LongToken((long) i), ByteBufferUtil.EMPTY_BYTE_BUFFER), group), val); + rows.put(allocator.clone(new BufferDecoratedKey(new LongToken(i), ByteBufferUtil.EMPTY_BYTE_BUFFER), group), val); double avgSize = ObjectSizes.measureDeep(rows) / (double) count; rowOverhead = (int) ((avgSize - Math.floor(avgSize)) < 0.05 ? Math.floor(avgSize) : Math.ceil(avgSize)); - rowOverhead -= ObjectSizes.measureDeep(new LongToken((long) 0)); + rowOverhead -= ObjectSizes.measureDeep(new LongToken(0)); rowOverhead += AtomicBTreeColumns.EMPTY_SIZE; allocator.setDiscarding(); allocator.setDiscarded(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/db/marshal/UserType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java index ec97a7f..45c5f0e 100644 --- a/src/java/org/apache/cassandra/db/marshal/UserType.java +++ b/src/java/org/apache/cassandra/db/marshal/UserType.java @@ -178,7 +178,7 @@ public class UserType extends TupleType { for (Object fieldName : keys) { - if (!stringFieldNames.contains((String) fieldName)) + if (!stringFieldNames.contains(fieldName)) throw new MarshalException(String.format( "Unknown field '%s' in value of user defined type %s", fieldName, getNameAsString())); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java index 0c3c094..96c603e 100644 --- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java +++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java @@ -194,7 +194,7 @@ public class Murmur3Partitioner implements IPartitioner throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?"); // 1-case if (sortedTokens.size() == 1) - ownerships.put((Token) i.next(), new Float(1.0)); + ownerships.put(i.next(), new Float(1.0)); // n-case else { @@ -205,7 +205,7 @@ public class Murmur3Partitioner implements IPartitioner while (i.hasNext()) { - t = (Token) i.next(); ti = BigInteger.valueOf(((LongToken) t).token); // The next token and its value + t = i.next(); ti = BigInteger.valueOf(((LongToken) t).token); // The next token and its value float age = new BigDecimal(ti.subtract(tim1).add(ri).mod(ri)).divide(r, 6, BigDecimal.ROUND_HALF_EVEN).floatValue(); // %age = ((T(i) - T(i-1) + R) % R) / R ownerships.put(t, age); // save (T(i) -> %age) tim1 = ti; // -> advance loop http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/dht/Range.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java index 936ad21..cbf093c 100644 --- a/src/java/org/apache/cassandra/dht/Range.java +++ b/src/java/org/apache/cassandra/dht/Range.java @@ -311,7 +311,7 @@ public class Range<T extends RingPosition<T>> extends AbstractBounds<T> implemen else { @SuppressWarnings("unchecked") - Range<T>[] intersections = (Range<T>[]) new Range[intersectionSet.size()]; + Range<T>[] intersections = new Range[intersectionSet.size()]; intersectionSet.toArray(intersections); if (intersections.length == 1) { @@ -422,7 +422,7 @@ public class Range<T extends RingPosition<T>> extends AbstractBounds<T> implemen Iterator<Range<T>> iter = ranges.iterator(); Range<T> current = iter.next(); - T min = (T) current.left.minValue(); + T min = current.left.minValue(); while (iter.hasNext()) { // If current goes to the end of the ring, we're done http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 9360e964..0c449ec 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -87,9 +87,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean public static final long aVeryLongTime = 259200 * 1000; // 3 days - /** Maximimum difference in generation and version values we are willing to accept about a peer */ + /** Maximum difference in generation and version values we are willing to accept about a peer */ private static final long MAX_GENERATION_DIFFERENCE = 86400 * 365; - private long FatClientTimeout; + private long fatClientTimeout; private final Random random = new Random(); private final Comparator<InetAddress> inetcomparator = new Comparator<InetAddress>() { @@ -195,7 +195,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean private Gossiper() { // half of QUARATINE_DELAY, to ensure justRemovedEndpoints has enough leeway to prevent re-gossip - FatClientTimeout = (long) (QUARANTINE_DELAY / 2); + fatClientTimeout = (QUARANTINE_DELAY / 2); /* register with the Failure Detector for receiving Failure detector events */ FailureDetector.instance.registerFailureDetectionEventListener(this); @@ -738,9 +738,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean // gossip after FatClientTimeout. Do not remove dead states here. if (isGossipOnlyMember(endpoint) && !justRemovedEndpoints.containsKey(endpoint) - && TimeUnit.NANOSECONDS.toMillis(nowNano - epState.getUpdateTimestamp()) > FatClientTimeout) + && TimeUnit.NANOSECONDS.toMillis(nowNano - epState.getUpdateTimestamp()) > fatClientTimeout) { - logger.info("FatClient {} has been silent for {}ms, removing from gossip", endpoint, FatClientTimeout); + logger.info("FatClient {} has been silent for {}ms, removing from gossip", endpoint, fatClientTimeout); removeEndpoint(endpoint); // will put it in justRemovedEndpoints to respect quarantine delay evictFromMembership(endpoint); // can get rid of the state immediately } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index 8be9a18..35437e9 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -589,6 +589,6 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap public long getPos() throws IOException { - return (long)iter.rowsRead(); + return iter.rowsRead(); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index affae5a..308bdf8 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@ -226,7 +226,7 @@ public class CqlRecordReader extends RecordReader<Long, Row> public long getPos() throws IOException { - return (long) rowIterator.totalRead; + return rowIterator.totalRead; } public Long createKey() http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index dc1ffe2..0a64c87 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -123,7 +123,7 @@ public class CassandraStorage extends AbstractCassandraStorage { if (tuple.size() == 0) // lastRow is a new one { - key = (ByteBuffer)reader.getCurrentKey(); + key = reader.getCurrentKey(); tuple = keyToTuple(key, cfDef, parseType(cfDef.getKey_validation_class())); } for (Map.Entry<ByteBuffer, Cell> entry : lastRow.entrySet()) @@ -146,18 +146,18 @@ public class CassandraStorage extends AbstractCassandraStorage return null; } } - if (key != null && !((ByteBuffer)reader.getCurrentKey()).equals(key)) // key changed + if (key != null && !(reader.getCurrentKey()).equals(key)) // key changed { // read too much, hold on to it for next time - lastKey = (ByteBuffer)reader.getCurrentKey(); - lastRow = (SortedMap<ByteBuffer, Cell>)reader.getCurrentValue(); + lastKey = reader.getCurrentKey(); + lastRow = reader.getCurrentValue(); // but return what we have so far tuple.append(bag); return tuple; } if (key == null) // only set the key on the first iteration { - key = (ByteBuffer)reader.getCurrentKey(); + key = reader.getCurrentKey(); if (lastKey != null && !(key.equals(lastKey))) // last key only had one value { if (tuple == null) @@ -170,7 +170,7 @@ public class CassandraStorage extends AbstractCassandraStorage } tuple.append(bag); lastKey = key; - lastRow = (SortedMap<ByteBuffer, Cell>)reader.getCurrentValue(); + lastRow = reader.getCurrentValue(); return tuple; } if (tuple == null) @@ -820,7 +820,7 @@ public class CassandraStorage extends AbstractCassandraStorage public ByteBuffer nullToBB() { - return (ByteBuffer) null; + return null; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/metrics/RestorableMeter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/RestorableMeter.java b/src/java/org/apache/cassandra/metrics/RestorableMeter.java index b543665..9e2ed92 100644 --- a/src/java/org/apache/cassandra/metrics/RestorableMeter.java +++ b/src/java/org/apache/cassandra/metrics/RestorableMeter.java @@ -158,7 +158,7 @@ public class RestorableMeter */ public RestorableEWMA(long windowInSeconds) { this.alpha = 1 - exp((-TICK_INTERVAL / NANOS_PER_SECOND) / windowInSeconds); - this.interval = (double) TICK_INTERVAL; + this.interval = TICK_INTERVAL; } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/streaming/StreamManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamManager.java b/src/java/org/apache/cassandra/streaming/StreamManager.java index 728631d..dc8ec19 100644 --- a/src/java/org/apache/cassandra/streaming/StreamManager.java +++ b/src/java/org/apache/cassandra/streaming/StreamManager.java @@ -70,10 +70,10 @@ public class StreamManager implements StreamManagerMBean public StreamRateLimiter(InetAddress peer) { - double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT; + double throughput = DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec() * BYTES_PER_MEGABIT; mayUpdateThroughput(throughput, limiter); - double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT; + double interDCThroughput = DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec() * BYTES_PER_MEGABIT; mayUpdateThroughput(interDCThroughput, interDCLimiter); if (DatabaseDescriptor.getLocalDataCenter() != null && DatabaseDescriptor.getEndpointSnitch() != null) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/tools/SSTableImport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java index 84613e9..d3a2683 100644 --- a/src/java/org/apache/cassandra/tools/SSTableImport.java +++ b/src/java/org/apache/cassandra/tools/SSTableImport.java @@ -124,7 +124,7 @@ public class SSTableImport } else if (isCounter()) { - timestampOfLastDelete = (long) ((Integer) fields.get(4)); + timestampOfLastDelete = ((Integer) fields.get(4)); } else if (isRangeTombstone()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/utils/FastByteOperations.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FastByteOperations.java b/src/java/org/apache/cassandra/utils/FastByteOperations.java index 6e25492..f35d2e2 100644 --- a/src/java/org/apache/cassandra/utils/FastByteOperations.java +++ b/src/java/org/apache/cassandra/utils/FastByteOperations.java @@ -349,8 +349,8 @@ public class FastByteOperations int wordComparisons = minLength & ~7; for (int i = 0; i < wordComparisons ; i += Longs.BYTES) { - long lw = theUnsafe.getLong(buffer1, memoryOffset1 + (long) i); - long rw = theUnsafe.getLong(buffer2, memoryOffset2 + (long) i); + long lw = theUnsafe.getLong(buffer1, memoryOffset1 + i); + long rw = theUnsafe.getLong(buffer2, memoryOffset2 + i); if (lw != rw) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/utils/HistogramBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/HistogramBuilder.java b/src/java/org/apache/cassandra/utils/HistogramBuilder.java index c2accb2..5d22352 100644 --- a/src/java/org/apache/cassandra/utils/HistogramBuilder.java +++ b/src/java/org/apache/cassandra/utils/HistogramBuilder.java @@ -88,7 +88,7 @@ public class HistogramBuilder max = value; } - final long mean = (long)Math.round(sum / count); + final long mean = Math.round(sum / count); final double stdev = Math.sqrt((sumsq / count) - (mean * (double) mean)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fab7b78/src/java/org/apache/cassandra/utils/IntervalTree.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree.java index 4522e27..376d1bc 100644 --- a/src/java/org/apache/cassandra/utils/IntervalTree.java +++ b/src/java/org/apache/cassandra/utils/IntervalTree.java @@ -67,7 +67,7 @@ public class IntervalTree<C extends Comparable<? super C>, D, I extends Interval @SuppressWarnings("unchecked") public static <C extends Comparable<? super C>, D, I extends Interval<C, D>> IntervalTree<C, D, I> emptyTree() { - return (IntervalTree<C, D, I>)EMPTY_TREE; + return EMPTY_TREE; } public int intervalCount()
