Repository: cassandra Updated Branches: refs/heads/trunk ab793c7f3 -> 733d1ee64
trunk eclipse-warnings patch by jasobrown, reviewed by blerer for CASSANDRA-11086 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/733d1ee6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/733d1ee6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/733d1ee6 Branch: refs/heads/trunk Commit: 733d1ee6427cef1042f6c2f864caef81c1a5d32f Parents: ab793c7 Author: Jason Brown <[email protected]> Authored: Wed Mar 2 06:51:52 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Mon Mar 7 16:12:32 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/index/sasi/TermIterator.java | 1 + src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java | 1 + src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java | 2 ++ .../org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java | 1 + .../apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java | 2 ++ src/java/org/apache/cassandra/index/sasi/plan/Operation.java | 1 + src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java | 1 + .../apache/cassandra/index/sasi/utils/CombinedTermIterator.java | 1 + .../cassandra/index/sasi/utils/RangeIntersectionIterator.java | 1 + .../org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java | 1 + 11 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index cd9d8d9..b4ce53d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.6 + * Resolve some eclipse-warnings (CASSANDRA-11086) * (cqlsh) Show static columns in a different color (CASSANDRA-11059) * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/TermIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/TermIterator.java b/src/java/org/apache/cassandra/index/sasi/TermIterator.java index cfa87c0..d2db88c 100644 --- a/src/java/org/apache/cassandra/index/sasi/TermIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/TermIterator.java @@ -79,6 +79,7 @@ public class TermIterator extends RangeIterator<Long, Token> this.referencedIndexes = referencedIndexes; } + @SuppressWarnings("resource") public static TermIterator build(final Expression e, Set<SSTableIndex> perSSTableIndexes) { final List<RangeIterator<Long, Token>> tokens = new CopyOnWriteArrayList<>(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java index 32cda53..e335b50 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskBlock.java @@ -81,6 +81,7 @@ public abstract class OnDiskBlock<T extends Term> return new SearchResult<>(element, cmp, middle); } + @SuppressWarnings("resource") protected T getTerm(int index) { MappedBuffer dup = blockIndex.duplicate(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java index a84e8bf..ef487f1 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndex.java @@ -114,6 +114,7 @@ public class OnDiskIndex implements Iterable<OnDiskIndex.DataTerm>, Closeable protected final ByteBuffer minTerm, maxTerm, minKey, maxKey; + @SuppressWarnings("resource") public OnDiskIndex(File index, AbstractType<?> cmp, Function<Long, DecoratedKey> keyReader) { keyFetcher = keyReader; @@ -256,6 +257,7 @@ public class OnDiskIndex implements Iterable<OnDiskIndex.DataTerm>, Closeable RangeUnionIterator.Builder<Long, Token> builder = RangeUnionIterator.builder(); for (Expression e : ranges) { + @SuppressWarnings("resource") RangeIterator<Long, Token> range = searchRange(e); if (range != null) builder.add(range); http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java index 04b7b1c..5adecf8 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java @@ -245,6 +245,7 @@ public class OnDiskIndexBuilder return true; } + @SuppressWarnings("resource") protected void finish(Descriptor descriptor, Pair<ByteBuffer, ByteBuffer> range, File file, TermIterator terms) { SequentialWriter out = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java b/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java index 6e63c71..018900e 100644 --- a/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java @@ -281,6 +281,7 @@ public class PerSSTableIndexWriter implements SSTableFlushObserver // parts are present but there is something still in memory, let's flush that inline if (!currentBuilder.isEmpty()) { + @SuppressWarnings("resource") OnDiskIndex last = scheduleSegmentFlush(false).call(); segments.add(Futures.immediateFuture(last)); } @@ -290,6 +291,7 @@ public class PerSSTableIndexWriter implements SSTableFlushObserver for (Future<OnDiskIndex> f : segments) { + @SuppressWarnings("resource") OnDiskIndex part = Futures.getUnchecked(f); if (part == null) continue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/plan/Operation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/plan/Operation.java b/src/java/org/apache/cassandra/index/sasi/plan/Operation.java index f8b02a3..6f0904c 100644 --- a/src/java/org/apache/cassandra/index/sasi/plan/Operation.java +++ b/src/java/org/apache/cassandra/index/sasi/plan/Operation.java @@ -39,6 +39,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.*; import org.apache.cassandra.utils.FBUtilities; +@SuppressWarnings("resource") public class Operation extends RangeIterator<Long, Token> { public enum OperationType http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java index 2bf5a07..0131d46 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTerm.java @@ -43,6 +43,7 @@ public class CombinedTerm implements CombinedValue<DataTerm> this.term = term; this.tokens = new TreeMap<>(); + @SuppressWarnings("resource") RangeIterator<Long, Token> tokens = term.getTokens(); while (tokens.hasNext()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java index 06c27bf..c29de06 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/CombinedTermIterator.java @@ -26,6 +26,7 @@ import org.apache.cassandra.index.sasi.sa.TermIterator; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.utils.Pair; +@SuppressWarnings("resource") public class CombinedTermIterator extends TermIterator { final Descriptor descriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java index 0d2214a..02d9527 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java @@ -28,6 +28,7 @@ import org.apache.cassandra.io.util.FileUtils; import com.google.common.annotations.VisibleForTesting; +@SuppressWarnings("resource") public class RangeIntersectionIterator { protected enum Strategy http://git-wip-us.apache.org/repos/asf/cassandra/blob/733d1ee6/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java b/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java index 310b6d0..4be460c 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java @@ -36,6 +36,7 @@ import org.apache.cassandra.io.util.FileUtils; * @param <K> The type used to sort ranges. * @param <D> The container type which is going to be returned by {@link Iterator#next()}. */ +@SuppressWarnings("resource") public class RangeUnionIterator<K extends Comparable<K>, D extends CombinedValue<K>> extends RangeIterator<K, D> { private final PriorityQueue<RangeIterator<K, D>> ranges;
