From 0a28337b513719a061719847975de425b5949b47 Mon Sep 17 00:00:00 2001 From: Aman Poonia Date: Sun, 21 Jan 2018 22:21:15 +0530 Subject: [PATCH] Use explicit casting to avoid side effects --- .../src/main/java/org/apache/hadoop/hbase/client/Append.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/client/Mutation.java | 6 +++--- .../main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java | 4 ++-- .../org/apache/hadoop/hbase/regionserver/CompactionPipeline.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java | 2 +- .../hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 61474b7e35..042209c076 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; @InterfaceAudience.Public public class Append extends Mutation { private static final Logger LOG = LoggerFactory.getLogger(Append.class); - private static final long HEAP_OVERHEAD = ClassSize.REFERENCE + ClassSize.TIMERANGE; + private static final long HEAP_OVERHEAD = (long)ClassSize.REFERENCE + ClassSize.TIMERANGE; private TimeRange tr = new TimeRange(); /** diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java index 1569d26166..4398fd6816 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java @@ -66,7 +66,7 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C HeapSize { public static final long MUTATION_OVERHEAD = ClassSize.align( // This - ClassSize.OBJECT + + (long)ClassSize.OBJECT + // row + OperationWithAttributes.attributes 2 * ClassSize.REFERENCE + // Timestamp @@ -791,10 +791,10 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C private static final class CellWrapper implements ExtendedCell { private static final long FIXED_OVERHEAD = ClassSize.align( - ClassSize.OBJECT // object header + (long)ClassSize.OBJECT // object header + KeyValue.TIMESTAMP_SIZE // timestamp + Bytes.SIZEOF_LONG // sequence id - + 1 * ClassSize.REFERENCE); // references to cell + + 1L * ClassSize.REFERENCE); // references to cell private final Cell cell; private long sequenceId; private long timestamp; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java index 7093b4b2dc..6a95a7c67e 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java @@ -27,7 +27,7 @@ import org.apache.yetus.audience.InterfaceAudience; public class IndividualBytesFieldCell implements ExtendedCell { private static final long FIXED_OVERHEAD = ClassSize.align( // do alignment(padding gap) - ClassSize.OBJECT // object header + (long)ClassSize.OBJECT // object header + KeyValue.TIMESTAMP_TYPE_SIZE // timestamp and type + Bytes.SIZEOF_LONG // sequence id + 5 * ClassSize.REFERENCE); // references to all byte arrays: row, family, qualifier, value, tags diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java index bdcb8f5524..d48ab60ed0 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java @@ -1783,7 +1783,7 @@ public final class PrivateCellUtil { FirstOnRowCell.FIXED_HEAPSIZE + Bytes.SIZEOF_BYTE // flength + Bytes.SIZEOF_INT * 3 // foffset, qoffset, qlength - + ClassSize.REFERENCE * 2; // fArray, qArray + + (long)ClassSize.REFERENCE * 2; // fArray, qArray private final byte[] fArray; private final int foffset; private final byte flength; @@ -1944,7 +1944,7 @@ public final class PrivateCellUtil { } private static class LastOnRowColCell extends LastOnRowCell { - private static final long FIXED_OVERHEAD = LastOnRowCell.FIXED_OVERHEAD + private static final long FIXED_OVERHEAD = (long)LastOnRowCell.FIXED_OVERHEAD + ClassSize.REFERENCE * 2 // fArray and qArray + Bytes.SIZEOF_INT * 3 // foffset, qoffset, qlength + Bytes.SIZEOF_BYTE; // flength diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java index a07842c906..461f900049 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java @@ -57,7 +57,7 @@ public class CompactionPipeline { private static final Logger LOG = LoggerFactory.getLogger(CompactionPipeline.class); public final static long FIXED_OVERHEAD = ClassSize - .align(ClassSize.OBJECT + (3 * ClassSize.REFERENCE) + Bytes.SIZEOF_LONG); + .align((long)ClassSize.OBJECT + (3 * ClassSize.REFERENCE) + Bytes.SIZEOF_LONG); public final static long DEEP_OVERHEAD = FIXED_OVERHEAD + (2 * ClassSize.LINKEDLIST); private final RegionServicesForStores region; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index aa9fa0384c..f50d8bb675 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -445,7 +445,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } static final long HEAP_SIZE = ClassSize.align( - ClassSize.OBJECT + 5 * Bytes.SIZEOF_BOOLEAN); + (long)ClassSize.OBJECT + 5 * Bytes.SIZEOF_BOOLEAN); } /** @@ -7832,7 +7832,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } public static final long FIXED_OVERHEAD = ClassSize.align( - ClassSize.OBJECT + + (long)ClassSize.OBJECT + ClassSize.ARRAY + 50 * ClassSize.REFERENCE + 3 * Bytes.SIZEOF_INT + (14 * Bytes.SIZEOF_LONG) + diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 01121dd80e..f283a65532 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -2315,7 +2315,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat } public static final long FIXED_OVERHEAD = - ClassSize.align(ClassSize.OBJECT + (17 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG) + ClassSize.align((long)ClassSize.OBJECT + (17 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG) + (5 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN)); public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java index 94b1605515..c3ebbfe52d 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java @@ -48,7 +48,7 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti public class MemStoreCompactor { public static final long DEEP_OVERHEAD = ClassSize - .align(ClassSize.OBJECT + 4 * ClassSize.REFERENCE + .align((long)ClassSize.OBJECT + 4 * ClassSize.REFERENCE // compactingMemStore, versionedList, isInterrupted, strategy (the reference) // "action" is an enum and thus it is a class with static final constants, // so counting only the size of the reference to it and not the size of the internals diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java index 54095e000b..34d0ab9349 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java @@ -286,7 +286,7 @@ public class MultiVersionConcurrencyControl { } public static final long FIXED_SIZE = ClassSize.align( - ClassSize.OBJECT + + (long)ClassSize.OBJECT + 2 * Bytes.SIZEOF_LONG + 2 * ClassSize.REFERENCE); } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java index 419affffb5..084f7ffa61 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java @@ -51,7 +51,7 @@ public class ScanInfo { private final long preadMaxBytes; private final boolean newVersionBehavior; - public static final long FIXED_OVERHEAD = ClassSize.align(ClassSize.OBJECT + public static final long FIXED_OVERHEAD = ClassSize.align((long)ClassSize.OBJECT + (2 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_INT) + (4 * Bytes.SIZEOF_LONG) + (4 * Bytes.SIZEOF_BOOLEAN)); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java index 781efcc902..5bfab52261 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java @@ -48,7 +48,7 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti @InterfaceAudience.Private public abstract class Segment { - public final static long FIXED_OVERHEAD = ClassSize.align(ClassSize.OBJECT + public final static long FIXED_OVERHEAD = ClassSize.align((long)ClassSize.OBJECT + 6 * ClassSize.REFERENCE // cellSet, comparator, memStoreLAB, dataSize, // heapSize, and timeRangeTracker + Bytes.SIZEOF_LONG // minSequenceId diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index a1dd2d0c55..b6ea927efc 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -751,7 +751,7 @@ public class FSHLog extends AbstractFSWAL { } public static final long FIXED_OVERHEAD = ClassSize - .align(ClassSize.OBJECT + (5 * ClassSize.REFERENCE) + ClassSize.ATOMIC_INTEGER + .align((long)ClassSize.OBJECT + (5 * ClassSize.REFERENCE) + ClassSize.ATOMIC_INTEGER + Bytes.SIZEOF_INT + (3 * Bytes.SIZEOF_LONG)); /** diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java index 2aad203e25..abf9a26d85 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java @@ -980,7 +980,7 @@ public class WALSplitter { internify(entry); entryBuffer.add(entry); long incrHeap = entry.getEdit().heapSize() + - ClassSize.align(2 * ClassSize.REFERENCE) + // WALKey pointers + ClassSize.align(2L * ClassSize.REFERENCE) + // WALKey pointers 0; // TODO linkedlist entry heapInBuffer += incrHeap; return incrHeap; -- 2.16.0