This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7adfdc85cf Deprecate Throwables.propagate usage
7adfdc85cf is described below
commit 7adfdc85cf5c1cb505e6507e5c08de84834c2224
Author: Claude Warren, Jr <[email protected]>
AuthorDate: Fri Jul 22 08:56:13 2022 +0100
Deprecate Throwables.propagate usage
patch by Claude Warren; reviewed by Caleb Rackliffe and David Capwell for
CASSANDRA-14218
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/ChunkCache.java | 6 ++++--
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 15 ++++++++++-----
.../apache/cassandra/db/SnapshotDetailsTabularData.java | 2 +-
.../db/compaction/CompactionHistoryTabularData.java | 2 +-
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 3 +--
src/java/org/apache/cassandra/db/compaction/Upgrader.java | 3 ++-
src/java/org/apache/cassandra/db/compaction/Verifier.java | 3 ++-
src/java/org/apache/cassandra/db/memtable/Flushing.java | 4 +++-
src/java/org/apache/cassandra/hints/Hint.java | 3 ++-
.../apache/cassandra/io/compress/CompressionMetadata.java | 3 +--
.../org/apache/cassandra/io/sstable/ISSTableScanner.java | 3 ++-
.../cassandra/io/sstable/SSTableSimpleUnsortedWriter.java | 5 ++++-
.../apache/cassandra/io/sstable/SSTableSimpleWriter.java | 4 +++-
src/java/org/apache/cassandra/io/util/FileUtils.java | 3 +--
.../cassandra/repair/consistent/admin/CleanupSummary.java | 5 ++---
.../cassandra/repair/consistent/admin/PendingStat.java | 5 ++---
.../cassandra/repair/consistent/admin/PendingStats.java | 5 ++---
.../cassandra/repair/consistent/admin/RepairStats.java | 9 ++++-----
.../apache/cassandra/streaming/StreamTransferTask.java | 6 ++++--
.../streaming/management/ProgressInfoCompositeData.java | 8 +++-----
.../management/SessionCompleteEventCompositeData.java | 6 ++----
.../streaming/management/SessionInfoCompositeData.java | 7 +++----
.../streaming/management/StreamStateCompositeData.java | 5 ++---
.../streaming/management/StreamSummaryCompositeData.java | 6 ++----
src/java/org/apache/cassandra/tools/LoaderOptions.java | 3 +--
.../org/apache/cassandra/tools/SSTableOfflineRelevel.java | 3 ++-
src/java/org/apache/cassandra/utils/WrappedRunnable.java | 8 +++++---
.../cassandra/test/microbench/instance/ReadTest.java | 6 ++++--
.../test/microbench/instance/SimpleTableWriter.java | 6 ++++--
.../apache/cassandra/simulator/paxos/PaxosSimulation.java | 5 +++--
test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java | 3 ++-
test/unit/org/apache/cassandra/net/SocketUtils.java | 6 ++----
.../utils/bytecomparable/ByteSourceTestBase.java | 4 +---
34 files changed, 88 insertions(+), 78 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 1d82239c10..f49d5f2e1e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.2
+ * Deprecate Throwables.propagate usage (CASSANDRA-14218)
* Allow disabling hotness persistence for high sstable counts
(CASSANDRA-17868)
* Prevent NullPointerException when changing neverPurgeTombstones from true
to false (CASSANDRA-17897)
* Add metrics around storage usage and compression (CASSANDRA-17898)
diff --git a/src/java/org/apache/cassandra/cache/ChunkCache.java
b/src/java/org/apache/cassandra/cache/ChunkCache.java
index 51dbdc6694..cb05005a31 100644
--- a/src/java/org/apache/cassandra/cache/ChunkCache.java
+++ b/src/java/org/apache/cassandra/cache/ChunkCache.java
@@ -238,8 +238,10 @@ public class ChunkCache
}
catch (Throwable t)
{
- Throwables.propagateIfInstanceOf(t.getCause(),
CorruptSSTableException.class);
- throw Throwables.propagate(t);
+ if (t.getCause() instanceof CorruptSSTableException)
+ throw (CorruptSSTableException)t.getCause();
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
}
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 118069b38d..af3b8d13c9 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -174,7 +174,6 @@ import org.apache.cassandra.utils.concurrent.OpOrder;
import org.apache.cassandra.utils.concurrent.Refs;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
-import static com.google.common.base.Throwables.propagate;
import static
org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
import static org.apache.cassandra.config.DatabaseDescriptor.getFlushWriters;
import static org.apache.cassandra.db.commitlog.CommitLogPosition.NONE;
@@ -1111,7 +1110,10 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean, Memtable.Owner
metric.pendingFlushes.dec();
if (flushFailure != null)
- throw propagate(flushFailure);
+ {
+ Throwables.throwIfUnchecked(flushFailure);
+ throw new RuntimeException(flushFailure);
+ }
return commitLogUpperBound;
}
@@ -1272,7 +1274,8 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean, Memtable.Owner
{
t = Flushing.abortRunnables(flushRunnables, t);
t = txn.abort(t);
- throw Throwables.propagate(t);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
try
@@ -1298,7 +1301,8 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean, Memtable.Owner
for (SSTableMultiWriter writer : flushResults)
t = writer.abort(t);
t = txn.abort(t);
- Throwables.propagate(t);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
txn.prepareToCommit();
@@ -2455,7 +2459,8 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean, Memtable.Owner
catch (Throwable t)
{
memtableContent.close();
- Throwables.propagate(t);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
}
}
diff --git a/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java
b/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java
index c091ebd5e0..8e69071b45 100644
--- a/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java
+++ b/src/java/org/apache/cassandra/db/SnapshotDetailsTabularData.java
@@ -66,7 +66,7 @@ public class SnapshotDetailsTabularData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
index 485f1a0908..f483e3a19b 100644
---
a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
+++
b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
@@ -59,7 +59,7 @@ public class CompactionHistoryTabularData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
index dc6d2e11ff..8646682b7e 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -28,7 +28,6 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import org.apache.cassandra.io.util.File;
@@ -320,7 +319,7 @@ public class Scrubber implements Closeable
}
catch (IOException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally
{
diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
index 2bfb30b4e4..132a99cc68 100644
--- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
+++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
@@ -102,7 +102,8 @@ public class Upgrader
}
catch (Exception e)
{
- Throwables.propagate(e);
+ Throwables.throwIfUnchecked(e);
+ throw new RuntimeException(e);
}
finally
{
diff --git a/src/java/org/apache/cassandra/db/compaction/Verifier.java
b/src/java/org/apache/cassandra/db/compaction/Verifier.java
index bad050a6cc..a67593bf55 100644
--- a/src/java/org/apache/cassandra/db/compaction/Verifier.java
+++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java
@@ -376,7 +376,8 @@ public class Verifier implements Closeable
}
catch (Throwable t)
{
- throw Throwables.propagate(t);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
finally
{
diff --git a/src/java/org/apache/cassandra/db/memtable/Flushing.java
b/src/java/org/apache/cassandra/db/memtable/Flushing.java
index 1a31374652..0f89624a38 100644
--- a/src/java/org/apache/cassandra/db/memtable/Flushing.java
+++ b/src/java/org/apache/cassandra/db/memtable/Flushing.java
@@ -82,7 +82,9 @@ public class Flushing
}
catch (Throwable e)
{
- throw Throwables.propagate(abortRunnables(runnables, e));
+ Throwable t = abortRunnables(runnables, e);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
}
diff --git a/src/java/org/apache/cassandra/hints/Hint.java
b/src/java/org/apache/cassandra/hints/Hint.java
index 3089894b7f..88eb9b8863 100644
--- a/src/java/org/apache/cassandra/hints/Hint.java
+++ b/src/java/org/apache/cassandra/hints/Hint.java
@@ -120,7 +120,8 @@ public final class Hint
}
catch (Exception e)
{
- throw Throwables.propagate(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
+ throw new RuntimeException(e.getCause());
}
}
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 5af9c92c13..5ec0a04952 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@ -32,7 +32,6 @@ import java.util.SortedSet;
import java.util.TreeSet;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.common.primitives.Longs;
import org.apache.cassandra.db.TypeSizes;
@@ -412,7 +411,7 @@ public class CompressionMetadata
}
catch (FileNotFoundException | NoSuchFileException fnfe)
{
- throw Throwables.propagate(fnfe);
+ throw new RuntimeException(fnfe);
}
catch (IOException e)
{
diff --git a/src/java/org/apache/cassandra/io/sstable/ISSTableScanner.java
b/src/java/org/apache/cassandra/io/sstable/ISSTableScanner.java
index af661b7d66..671bccb824 100644
--- a/src/java/org/apache/cassandra/io/sstable/ISSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/ISSTableScanner.java
@@ -64,7 +64,8 @@ public interface ISSTableScanner extends
UnfilteredPartitionIterator
if (throwable != null)
{
- Throwables.propagate(throwable);
+ Throwables.throwIfUnchecked(throwable);
+ throw new RuntimeException(throwable);
}
}
diff --git
a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index 3b1ed1bf13..9ba2ab13ff 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@ -182,7 +182,10 @@ class SSTableSimpleUnsortedWriter extends
AbstractSSTableSimpleWriter
if (diskWriter.exception instanceof IOException)
throw (IOException) diskWriter.exception;
else
- throw Throwables.propagate(diskWriter.exception);
+ {
+ Throwables.throwIfUnchecked(diskWriter.exception);
+ throw new RuntimeException(diskWriter.exception);
+ }
}
}
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
index c9356a3d86..317ac2a85d 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
@@ -85,7 +85,9 @@ class SSTableSimpleWriter extends AbstractSSTableSimpleWriter
}
catch (Throwable t)
{
- throw Throwables.propagate(writer == null ? t : writer.abort(t));
+ Throwable e = writer == null ? t : writer.abort(t);
+ Throwables.throwIfUnchecked(e);
+ throw new RuntimeException(e);
}
}
diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java
b/src/java/org/apache/cassandra/io/util/FileUtils.java
index 08ab4f208d..b25bbe4bb8 100644
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -65,7 +65,6 @@ import
org.apache.cassandra.io.sstable.CorruptSSTableException;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.SyncUtil;
-import static com.google.common.base.Throwables.propagate;
import static
org.apache.cassandra.config.CassandraRelevantProperties.JAVA_IO_TMPDIR;
import static org.apache.cassandra.utils.Throwables.maybeFail;
@@ -479,7 +478,7 @@ public final class FileUtils
public static void handleFSErrorAndPropagate(FSError e)
{
JVMStabilityInspector.inspectThrowable(e);
- throw propagate(e);
+ throw e;
}
/**
diff --git
a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
index 2d21debe76..89b1eec573 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
@@ -32,7 +32,6 @@ import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
import org.apache.cassandra.db.ColumnFamilyStore;
@@ -57,7 +56,7 @@ public class CleanupSummary
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -126,7 +125,7 @@ public class CleanupSummary
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
index b7d4fea5bf..0f50e0ef61 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
@@ -32,7 +32,6 @@ import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.util.FileUtils;
@@ -55,7 +54,7 @@ public class PendingStat
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -94,7 +93,7 @@ public class PendingStat
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java
b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java
index f1b515e666..e253a0e61f 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStats.java
@@ -28,7 +28,6 @@ import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
public class PendingStats
{
@@ -51,7 +50,7 @@ public class PendingStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -87,7 +86,7 @@ public class PendingStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java
b/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java
index bbb4778e87..6d3e424927 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/RepairStats.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.management.openmbean.*;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.cassandra.repair.consistent.RepairedState;
@@ -47,7 +46,7 @@ public class RepairStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -75,7 +74,7 @@ public class RepairStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -112,7 +111,7 @@ public class RepairStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -165,7 +164,7 @@ public class RepairStats
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 45fbcc6b07..0721316ccb 100644
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@ -143,8 +143,10 @@ public class StreamTransferTask extends StreamTask
}
}
streams.clear();
- if (fail != null)
- Throwables.propagate(fail);
+ if (fail != null) {
+ Throwables.throwIfUnchecked(fail);
+ throw new RuntimeException(fail);
+ }
}
public synchronized int getTotalNumberOfFiles()
diff --git
a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
index a3eb7d1f34..a52c029300 100644
---
a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
+++
b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.management.openmbean.*;
-import com.google.common.base.Throwables;
-
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.streaming.ProgressInfo;
import org.apache.cassandra.utils.TimeUUID;
@@ -68,7 +66,7 @@ public class ProgressInfoCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -89,7 +87,7 @@ public class ProgressInfoCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -107,7 +105,7 @@ public class ProgressInfoCompositeData
}
catch (UnknownHostException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git
a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
index 665b4cdbc7..1a6fea5da8 100644
---
a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
+++
b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
@@ -21,8 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.management.openmbean.*;
-import com.google.common.base.Throwables;
-
import org.apache.cassandra.streaming.StreamEvent;
public class SessionCompleteEventCompositeData
@@ -53,7 +51,7 @@ public class SessionCompleteEventCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -70,7 +68,7 @@ public class SessionCompleteEventCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git
a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
index f39b32195f..d7a78e39f6 100644
---
a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
+++
b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
@@ -22,7 +22,6 @@ import java.util.*;
import javax.management.openmbean.*;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -83,7 +82,7 @@ public class SessionInfoCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -121,7 +120,7 @@ public class SessionInfoCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -138,7 +137,7 @@ public class SessionInfoCompositeData
}
catch (UnknownHostException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Function<CompositeData, StreamSummary> toStreamSummary = new
Function<CompositeData, StreamSummary>()
{
diff --git
a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
index 5ee4f32807..c04205f620 100644
---
a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
+++
b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
@@ -21,7 +21,6 @@ import java.util.*;
import javax.management.openmbean.*;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -67,7 +66,7 @@ public class StreamStateCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -114,7 +113,7 @@ public class StreamStateCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
index a1f2496b33..05a0afcfd4 100644
---
a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
+++
b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
@@ -21,8 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.management.openmbean.*;
-import com.google.common.base.Throwables;
-
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.streaming.StreamSummary;
@@ -53,7 +51,7 @@ public class StreamSummaryCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -69,7 +67,7 @@ public class StreamSummaryCompositeData
}
catch (OpenDataException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/src/java/org/apache/cassandra/tools/LoaderOptions.java
b/src/java/org/apache/cassandra/tools/LoaderOptions.java
index 03768af2e4..e9a1f8bf02 100644
--- a/src/java/org/apache/cassandra/tools/LoaderOptions.java
+++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java
@@ -29,7 +29,6 @@ import java.net.UnknownHostException;
import java.util.HashSet;
import java.util.Set;
-import com.google.common.base.Throwables;
import com.google.common.net.HostAndPort;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -202,7 +201,7 @@ public class LoaderOptions
}
catch (UnknownHostException e)
{
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new LoaderOptions(this);
diff --git a/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
b/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
index e4e343fe51..b6948b4f17 100644
--- a/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
+++ b/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
@@ -122,7 +122,8 @@ public class SSTableOfflineRelevel
catch (Throwable t)
{
out.println("Couldn't open sstable:
"+sstable.getKey().filenameFor(Component.DATA));
- Throwables.propagate(t);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
}
}
diff --git a/src/java/org/apache/cassandra/utils/WrappedRunnable.java
b/src/java/org/apache/cassandra/utils/WrappedRunnable.java
index 1de7a461cd..981e027aeb 100644
--- a/src/java/org/apache/cassandra/utils/WrappedRunnable.java
+++ b/src/java/org/apache/cassandra/utils/WrappedRunnable.java
@@ -17,8 +17,6 @@
*/
package org.apache.cassandra.utils;
-import com.google.common.base.Throwables;
-
public abstract class WrappedRunnable implements Runnable
{
public final void run()
@@ -27,9 +25,13 @@ public abstract class WrappedRunnable implements Runnable
{
runMayThrow();
}
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
catch (Exception e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/test/microbench/org/apache/cassandra/test/microbench/instance/ReadTest.java
b/test/microbench/org/apache/cassandra/test/microbench/instance/ReadTest.java
index 54f721bbb7..a9fc57d8f5 100644
---
a/test/microbench/org/apache/cassandra/test/microbench/instance/ReadTest.java
+++
b/test/microbench/org/apache/cassandra/test/microbench/instance/ReadTest.java
@@ -109,7 +109,8 @@ public abstract class ReadTest extends SimpleTableWriter
}
catch (Throwable throwable)
{
- throw
Throwables.propagate(throwable);
+
Throwables.throwIfUnchecked(throwable);
+ throw new
RuntimeException(throwable);
}
}));
}
@@ -142,7 +143,8 @@ public abstract class ReadTest extends SimpleTableWriter
}
catch (Throwable throwable)
{
- throw
Throwables.propagate(throwable);
+
Throwables.throwIfUnchecked(throwable);
+ throw new
RuntimeException(throwable);
}
}));
}
diff --git
a/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java
b/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java
index fba8d16b6b..cc78e03e3a 100644
---
a/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java
+++
b/test/microbench/org/apache/cassandra/test/microbench/instance/SimpleTableWriter.java
@@ -138,7 +138,8 @@ public abstract class SimpleTableWriter extends CQLTester
}
catch (Throwable throwable)
{
- throw
Throwables.propagate(throwable);
+
Throwables.throwIfUnchecked(throwable);
+ throw new
RuntimeException(throwable);
}
}));
}
@@ -169,7 +170,8 @@ public abstract class SimpleTableWriter extends CQLTester
}
catch (Throwable throwable)
{
- throw
Throwables.propagate(throwable);
+
Throwables.throwIfUnchecked(throwable);
+ throw new
RuntimeException(throwable);
}
}));
}
diff --git
a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java
b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java
index 63e84dcf24..d54cc36851 100644
---
a/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java
+++
b/test/simulator/main/org/apache/cassandra/simulator/paxos/PaxosSimulation.java
@@ -262,8 +262,9 @@ public abstract class PaxosSimulation implements
Simulation, ClusterActionListen
}
log(causedByPrimaryKey);
- if (causedByPrimaryKey != null) throw
Throwables.propagate(causedByThrowable);
- else throw Throwables.propagate(simulated.failures.get().get(0));
+ Throwable t = (causedByPrimaryKey != null) ? causedByThrowable :
simulated.failures.get().get(0);
+ Throwables.throwIfUnchecked(t);
+ throw new RuntimeException(t);
}
public void close()
diff --git a/test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
b/test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
index 63ff055d2b..89c64723cf 100644
--- a/test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
+++ b/test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
@@ -150,7 +150,8 @@ public class MemtableSizeTest extends CQLTester
}
catch (Throwable throwable)
{
- Throwables.propagate(throwable);
+ Throwables.throwIfUnchecked(throwable);
+ throw new RuntimeException(throwable);
}
}
}
\ No newline at end of file
diff --git a/test/unit/org/apache/cassandra/net/SocketUtils.java
b/test/unit/org/apache/cassandra/net/SocketUtils.java
index 78a49bddbf..23d1cc5785 100644
--- a/test/unit/org/apache/cassandra/net/SocketUtils.java
+++ b/test/unit/org/apache/cassandra/net/SocketUtils.java
@@ -21,8 +21,6 @@ package org.apache.cassandra.net;
import java.io.IOException;
import java.net.ServerSocket;
-import com.google.common.base.Throwables;
-
public class SocketUtils
{
public static synchronized int findAvailablePort() throws RuntimeException
@@ -37,7 +35,7 @@ public class SocketUtils
}
catch (IOException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally
{
@@ -49,7 +47,7 @@ public class SocketUtils
}
catch (IOException e)
{
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git
a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceTestBase.java
b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceTestBase.java
index 90463f6305..050bec5171 100644
---
a/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceTestBase.java
+++
b/test/unit/org/apache/cassandra/utils/bytecomparable/ByteSourceTestBase.java
@@ -30,8 +30,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
-import com.google.common.base.Throwables;
-
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BooleanType;
import org.apache.cassandra.db.marshal.DecimalType;
@@ -434,7 +432,7 @@ public class ByteSourceTestBase
}
catch (UnknownHostException e)
{
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
