Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 6fe6c99ba -> 7aafe053e
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aafe053/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java index 5b46700..5448390 100644 --- a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java +++ b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java @@ -61,9 +61,9 @@ public class NativeSSTableLoaderClient extends SSTableLoader.Client if (username != null && password != null) builder = builder.withCredentials(username, password); - try (Cluster cluster = builder.build()) + try (Cluster cluster = builder.build(); Session session = cluster.connect()) { - Session session = cluster.connect(); + Metadata metadata = cluster.getMetadata(); setPartitioner(metadata.getPartitioner()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aafe053/src/java/org/apache/cassandra/utils/concurrent/Ref.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/Ref.java b/src/java/org/apache/cassandra/utils/concurrent/Ref.java index ebabd79..3df3ea4 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Ref.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Ref.java @@ -49,7 +49,7 @@ import static org.apache.cassandra.utils.Throwables.merge; * Once the Ref.GlobalState has been completely released, the Tidy method is called and it removes the global reference * to itself so it may also be collected. */ -public final class Ref<T> implements RefCounted<T>, AutoCloseable +public final class Ref<T> implements RefCounted<T> { static final Logger logger = LoggerFactory.getLogger(Ref.class); public static final boolean DEBUG_ENABLED = System.getProperty("cassandra.debugrefcount", "false").equalsIgnoreCase("true"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aafe053/src/java/org/apache/cassandra/utils/concurrent/Refs.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/Refs.java b/src/java/org/apache/cassandra/utils/concurrent/Refs.java index dd65971..bbc672d 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Refs.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Refs.java @@ -89,6 +89,12 @@ public final class Refs<T extends RefCounted<T>> extends AbstractCollection<T> i return ref != null; } + public void relaseAllExcept(Collection<T> keep) + { + Collection<T> release = new ArrayList<>(references.keySet()); + release.retainAll(keep); + release(release); + } /** * Release a retained Ref to all of the provided objects; if any is not held, an exception will be thrown * @param release http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aafe053/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java index 02efa65..46c1bd0 100644 --- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java +++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java @@ -125,6 +125,7 @@ public class OffHeapBitSet implements IBitSet return type.sizeof((int) bytes.size()) + bytes.size(); } + @SuppressWarnings("resource") public static OffHeapBitSet deserialize(DataInput in) throws IOException { long byteCount = in.readInt() * 8L;
