Repository: cassandra Updated Branches: refs/heads/trunk 6d22f6df6 -> c20085143
remove non essential @Inline calls patch by tjake; reviewed by belliottsmith for CASSANDRA-7736 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fc8899e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fc8899e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fc8899e Branch: refs/heads/trunk Commit: 1fc8899e23042fc8d9d7c2c11453db370fdcc574 Parents: 284f076 Author: T Jake Luciani <j...@apache.org> Authored: Tue Sep 9 15:30:17 2014 -0700 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Sep 9 15:35:58 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractNativeCell.java | 2 +- .../org/apache/cassandra/db/ArrayBackedSortedColumns.java | 1 - src/java/org/apache/cassandra/db/CollationController.java | 1 - src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 - src/java/org/apache/cassandra/service/StorageProxy.java | 2 -- src/java/org/apache/cassandra/utils/FastByteOperations.java | 9 --------- src/java/org/apache/cassandra/utils/MurmurHash.java | 1 - 7 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/db/AbstractNativeCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractNativeCell.java b/src/java/org/apache/cassandra/db/AbstractNativeCell.java index 7e85af3..e01d860 100644 --- a/src/java/org/apache/cassandra/db/AbstractNativeCell.java +++ b/src/java/org/apache/cassandra/db/AbstractNativeCell.java @@ -291,7 +291,6 @@ public abstract class AbstractNativeCell extends AbstractCell implements CellNam return get(i, null); } - @Inline private ByteBuffer get(int i, AbstractAllocator copy) { // remember to take dense/sparse into account, and only return EOC when not dense @@ -660,6 +659,7 @@ public abstract class AbstractNativeCell extends AbstractCell implements CellNam } // requires isByteOrderComparable to be true. Compares the name components only; ; may need to compare EOC etc still + @Inline public final int compareTo(final Composite that) { if (isStatic() != that.isStatic()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java index e92d5a3..c0fae24 100644 --- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java +++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java @@ -123,7 +123,6 @@ public class ArrayBackedSortedColumns extends ColumnFamily /** * synchronized so that concurrent (read-only) accessors don't mess the internal state. */ - @Inline private synchronized void sortCells() { if (isSorted) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java index c9cbf69..1bc421d 100644 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@ -68,7 +68,6 @@ public class CollationController * Once we have data for all requests columns that is newer than the newest remaining maxtimestamp, * we stop. */ - @Inline private ColumnFamily collectTimeOrderedData(boolean copyOnHeap) { final ColumnFamily container = ArrayBackedSortedColumns.factory.create(cfs.metadata, filter.filter.isReversed()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/db/ConsistencyLevel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java index 986a2aa..113de72 100644 --- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java +++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java @@ -245,7 +245,6 @@ public enum ConsistencyLevel } } - @Inline public void assureSufficientLiveNodes(Keyspace keyspace, Iterable<InetAddress> liveEndpoints) throws UnavailableException { int blockFor = blockFor(keyspace); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index ff6d89c..615335b 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1109,7 +1109,6 @@ public class StorageProxy implements StorageProxyMBean * Performs the actual reading of a row out of the StorageService, fetching * a specific set of column names from a given column family. */ - @Inline public static List<Row> read(List<ReadCommand> commands, ConsistencyLevel consistency_level) throws UnavailableException, IsBootstrappingException, ReadTimeoutException, InvalidRequestException { @@ -1188,7 +1187,6 @@ public class StorageProxy implements StorageProxyMBean * 4. If the digests (if any) match the data return the data * 5. else carry out read repair by getting data from all the nodes. */ - @Inline private static List<Row> fetchRows(List<ReadCommand> initialCommands, ConsistencyLevel consistencyLevel) throws UnavailableException, ReadTimeoutException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/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 1431fd3..1b58b66 100644 --- a/src/java/org/apache/cassandra/utils/FastByteOperations.java +++ b/src/java/org/apache/cassandra/utils/FastByteOperations.java @@ -40,37 +40,31 @@ public class FastByteOperations /** * Lexicographically compare two byte arrays. */ - @Inline public static int compareUnsigned(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { return BestHolder.BEST.compare(b1, s1, l1, b2, s2, l2); } - @Inline public static int compareUnsigned(ByteBuffer b1, byte[] b2, int s2, int l2) { return BestHolder.BEST.compare(b1, b2, s2, l2); } - @Inline public static int compareUnsigned(byte[] b1, int s1, int l1, ByteBuffer b2) { return -BestHolder.BEST.compare(b2, b1, s1, l1); } - @Inline public static int compareUnsigned(ByteBuffer b1, ByteBuffer b2) { return BestHolder.BEST.compare(b1, b2); } - @Inline public static void copy(ByteBuffer src, int srcPosition, byte[] trg, int trgPosition, int length) { BestHolder.BEST.copy(src, srcPosition, trg, trgPosition, length); } - @Inline public static void copy(ByteBuffer src, int srcPosition, ByteBuffer trg, int trgPosition, int length) { BestHolder.BEST.copy(src, srcPosition, trg, trgPosition, length); @@ -246,7 +240,6 @@ public class FastByteOperations copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length); } - @Inline public static void copy(Object src, long srcOffset, ByteBuffer trgBuf, int trgPosition, int length) { if (trgBuf.hasArray()) @@ -255,7 +248,6 @@ public class FastByteOperations copy(src, srcOffset, null, trgPosition + theUnsafe.getLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length); } - @Inline public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length) { if (length <= MIN_COPY_THRESHOLD) @@ -273,7 +265,6 @@ public class FastByteOperations private static final long UNSAFE_COPY_THRESHOLD = 1 << 20; private static final long MIN_COPY_THRESHOLD = 6; - @Inline public static void copy(Object src, long srcOffset, Object dst, long dstOffset, long length) { while (length > 0) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fc8899e/src/java/org/apache/cassandra/utils/MurmurHash.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MurmurHash.java b/src/java/org/apache/cassandra/utils/MurmurHash.java index bf83681..8d17ea9 100644 --- a/src/java/org/apache/cassandra/utils/MurmurHash.java +++ b/src/java/org/apache/cassandra/utils/MurmurHash.java @@ -172,7 +172,6 @@ public class MurmurHash return k; } - @Inline public static void hash3_x64_128(ByteBuffer key, int offset, int length, long seed, long[] result) { final int nblocks = length >> 4; // Process as 128-bit blocks.
