You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by le...@apache.org on 2019/03/14 21:28:42 UTC
[incubator-druid] branch master updated: Prohibit
Throwables.propagate() (#7121)
This is an automated email from the ASF dual-hosted git repository.
leventov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 7ada1c4 Prohibit Throwables.propagate() (#7121)
7ada1c4 is described below
commit 7ada1c49f9735a37808f3ed7656d93ae88b8b925
Author: Furkan KAMACI <fu...@gmail.com>
AuthorDate: Fri Mar 15 00:28:33 2019 +0300
Prohibit Throwables.propagate() (#7121)
* Throw caught exception.
* Throw caught exceptions.
* Related checkstyle rule is added to prevent further bugs.
* RuntimeException() is used instead of Throwables.propagate().
* Missing import is added.
* Throwables are propogated if possible.
* Throwables are propogated if possible.
* Throwables are propogated if possible.
* Throwables are propogated if possible.
* * Checkstyle definition is improved.
* Throwables.propagate() usages are removed.
* Checkstyle pattern is changed for only scanning "Throwables.propagate(" instead of checking lookbehind.
* Throwable is kept before firing a Runtime Exception.
* Fix unused assignments.
---
.../benchmark/GroupByTypeInterfaceBenchmark.java | 3 +--
.../druid/benchmark/datagen/SegmentGenerator.java | 3 +--
.../druid/benchmark/query/GroupByBenchmark.java | 3 +--
codestyle/checkstyle.xml | 6 ++++++
.../druid/collections/OrderedMergeSequence.java | 5 ++---
.../ReferenceCountingResourceHolder.java | 3 +--
.../apache/druid/common/config/ConfigManager.java | 5 ++---
.../druid/common/config/JacksonConfigManager.java | 13 ++++++------
.../apache/druid/common/config/Log4jShutdown.java | 3 +--
.../impl/AbstractTextFilesFirehoseFactory.java | 3 +--
.../druid/data/input/impl/prefetch/Fetcher.java | 5 ++---
.../org/apache/druid/guice/JsonConfigurator.java | 3 +--
.../apache/druid/java/util/common/FileUtils.java | 3 +--
.../apache/druid/java/util/common/RetryUtils.java | 2 +-
.../apache/druid/java/util/common/StreamUtils.java | 3 +--
.../apache/druid/java/util/common/StringUtils.java | 5 ++---
.../util/common/concurrent/ExecutorServices.java | 3 +--
.../java/util/common/guava/ConcatSequence.java | 6 ++----
.../java/util/common/guava/MergeSequence.java | 3 +--
.../java/util/common/guava/WrappingSequence.java | 8 +++++---
.../java/util/common/guava/WrappingYielder.java | 6 +++---
.../druid/java/util/common/guava/Yielders.java | 2 +-
.../java/util/emitter/core/HttpPostEmitter.java | 3 +--
.../util/emitter/core/ParametrizedUriEmitter.java | 5 ++---
.../java/util/http/client/HttpClientInit.java | 17 ++++++++--------
.../java/util/http/client/pool/ResourcePool.java | 5 +++--
.../SequenceInputStreamResponseHandler.java | 11 +++++------
.../apache/druid/java/util/metrics/SigarUtil.java | 3 +--
.../org/apache/druid/concurrent/ExecsTest.java | 3 +--
.../java/util/common/CompressionUtilsTest.java | 5 ++---
.../druid/java/util/emitter/core/GoHandler.java | 3 +--
.../druid/storage/azure/AzureByteSource.java | 3 +--
.../storage/azure/AzureDataSegmentPusher.java | 3 +--
.../apache/druid/storage/azure/AzureTaskLogs.java | 3 +--
.../storage/cloudfiles/CloudFilesByteSource.java | 3 +--
.../cloudfiles/CloudFilesDataSegmentPusher.java | 3 +--
.../storage/google/GoogleDataSegmentPusher.java | 3 +--
.../security/kerberos/KerberosAuthenticator.java | 3 +--
.../security/kerberos/KerberosHttpClient.java | 3 +--
.../druid/storage/hdfs/HdfsDataSegmentPuller.java | 3 +--
.../hdfs/HdfsFileTimestampVersionFinder.java | 3 +--
.../druid/storage/hdfs/HdfsStorageDruidModule.java | 3 +--
.../java/org/apache/hadoop/fs/HadoopFsWrapper.java | 5 ++---
.../storage/hdfs/HdfsDataSegmentPusherTest.java | 5 ++---
.../lookup/KafkaLookupExtractorFactoryTest.java | 3 +--
.../query/lookup/TestKafkaExtractionCluster.java | 3 +--
.../indexing/kafka/LegacyKafkaIndexTaskRunner.java | 4 ++--
.../druid/indexing/kafka/KafkaIndexTaskTest.java | 3 +--
.../indexing/kafka/KafkaRecordSupplierTest.java | 3 +--
.../indexing/kinesis/KinesisIndexTaskTest.java | 2 +-
.../kinesis/KinesisRecordSupplierTest.java | 3 +--
.../kinesis/supervisor/KinesisSupervisorTest.java | 3 +--
.../lookup/NamespaceLookupExtractorFactory.java | 7 +++----
.../lookup/namespace/UriExtractionNamespace.java | 3 +--
.../lookup/namespace/cache/CacheScheduler.java | 4 ++--
.../cache/NamespaceExtractionCacheManager.java | 3 +--
.../OffHeapNamespaceExtractionCacheManager.java | 4 ++--
.../lookup/namespace/JSONFlatDataParserTest.java | 3 +--
.../lookup/namespace/UriCacheGeneratorTest.java | 7 +++----
.../lookup/namespace/cache/CacheSchedulerTest.java | 7 +++----
.../cache/JdbcExtractionNamespaceTest.java | 7 +++----
.../NamespaceExtractionCacheManagersTest.java | 3 +--
.../druid/storage/s3/S3DataSegmentMover.java | 2 +-
.../druid/storage/s3/S3DataSegmentPuller.java | 5 ++---
.../druid/storage/s3/S3DataSegmentPusher.java | 3 +--
.../org/apache/druid/storage/s3/S3TaskLogs.java | 2 +-
.../storage/s3/S3TimestampVersionedDataFinder.java | 3 +--
.../indexer/DetermineHashedPartitionsJob.java | 3 +--
.../druid/indexer/DeterminePartitionsJob.java | 3 +--
.../druid/indexer/HadoopDruidIndexerConfig.java | 9 ++++-----
.../apache/druid/indexer/IndexGeneratorJob.java | 9 ++++-----
.../java/org/apache/druid/indexer/JobHelper.java | 9 ++++-----
.../indexer/hadoop/DatasourceRecordReader.java | 3 +--
.../druid/indexer/updater/HadoopConverterJob.java | 13 ++++++------
.../druid/indexer/BatchDeltaIngestionTest.java | 3 +--
.../druid/indexer/HadoopIngestionSpecTest.java | 15 +++++++-------
.../druid/indexer/HadoopTuningConfigTest.java | 3 +--
.../indexer/hadoop/FSSpideringIteratorTest.java | 5 ++---
.../partitions/HashedPartitionsSpecTest.java | 7 +++----
.../indexing/common/actions/LockAcquireAction.java | 3 +--
.../common/actions/RemoteTaskActionClient.java | 3 +--
.../common/actions/SegmentAllocateAction.java | 3 +--
.../indexing/common/index/YeOldePlumberSchool.java | 5 ++---
.../task/AppenderatorDriverRealtimeIndexTask.java | 2 +-
.../druid/indexing/common/task/HadoopTask.java | 7 +++----
.../druid/indexing/common/task/IndexTask.java | 2 +-
.../druid/indexing/common/task/MergeTask.java | 3 +--
.../indexing/common/task/RealtimeIndexTask.java | 5 ++---
.../firehose/IngestSegmentFirehoseFactory.java | 5 ++---
.../druid/indexing/overlord/ForkingTaskRunner.java | 3 +--
.../indexing/overlord/MetadataTaskStorage.java | 3 +--
.../druid/indexing/overlord/RemoteTaskRunner.java | 18 ++++++++---------
.../apache/druid/indexing/overlord/TaskMaster.java | 3 +--
.../apache/druid/indexing/overlord/TaskQueue.java | 3 +--
.../druid/indexing/overlord/TaskRunnerUtils.java | 3 +--
.../apache/druid/indexing/overlord/ZkWorker.java | 3 +--
.../autoscaling/ec2/GalaxyEC2UserData.java | 3 +--
.../overlord/hrtr/HttpRemoteTaskRunner.java | 12 +++++------
.../overlord/http/OverlordRedirectInfo.java | 3 +--
.../setup/JavaScriptWorkerSelectStrategy.java | 3 +--
.../overlord/supervisor/SupervisorManager.java | 3 +--
.../SeekableStreamIndexTaskRunner.java | 4 ++--
.../supervisor/SeekableStreamSupervisor.java | 13 ++++++------
.../worker/executor/ExecutorLifecycle.java | 9 ++++-----
.../AppenderatorDriverRealtimeIndexTaskTest.java | 3 +--
.../common/task/RealtimeIndexTaskTest.java | 3 +--
.../IngestSegmentFirehoseFactoryTimelineTest.java | 5 ++---
.../overlord/RemoteTaskRunnerTestUtils.java | 3 +--
.../druid/indexing/overlord/TaskLifecycleTest.java | 3 +--
.../overlord/hrtr/HttpRemoteTaskRunnerTest.java | 5 ++---
.../clients/AbstractQueryResourceTestClient.java | 3 +--
.../clients/ClientInfoResourceTestClient.java | 3 +--
.../clients/CoordinatorResourceTestClient.java | 13 ++++++------
.../clients/EventReceiverFirehoseTestClient.java | 5 ++---
.../clients/OverlordResourceTestClient.java | 13 ++++++------
.../org/apache/druid/testing/utils/RetryUtil.java | 3 +--
.../java/org/testng/DruidTestRunnerFactory.java | 3 +--
.../druid/tests/hadoop/ITHadoopIndexTest.java | 5 ++---
.../indexer/AbstractITRealtimeIndexTaskTest.java | 5 ++---
.../ITAppenderatorDriverRealtimeIndexTaskTest.java | 5 ++---
.../tests/indexer/ITKafkaIndexingServiceTest.java | 9 ++++-----
.../tests/indexer/ITNestedQueryPushDownTest.java | 3 +--
.../tests/indexer/ITRealtimeIndexTaskTest.java | 5 ++---
.../security/ITBasicAuthConfigurationTest.java | 3 +--
.../org/apache/druid/tests/security/ITTLSTest.java | 2 +-
.../collections/bitmap/RoaringBitmapFactory.java | 5 ++---
.../bitmap/WrappedImmutableRoaringBitmap.java | 3 +--
.../collections/bitmap/WrappedRoaringBitmap.java | 3 +--
.../org/apache/druid/guice/PropertiesModule.java | 3 +--
.../jackson/DruidDefaultSerializersModule.java | 3 +--
.../org/apache/druid/query/AsyncQueryRunner.java | 3 +--
.../druid/query/ChainedExecutionQueryRunner.java | 8 +++++---
.../druid/query/GroupByMergedQueryRunner.java | 8 +++++---
.../druid/query/extraction/MapLookupExtractor.java | 3 +--
.../epinephelinae/GroupByMergingQueryRunnerV2.java | 5 ++---
.../groupby/epinephelinae/ParallelCombiner.java | 3 +--
.../groupby/epinephelinae/SpillingGrouper.java | 5 ++---
.../druid/query/lookup/LookupExtractionFn.java | 3 +--
.../SegmentMetadataQueryRunnerFactory.java | 3 +--
.../incremental/OnheapIncrementalIndex.java | 3 +--
.../collections/spatial/ImmutableRTreeTest.java | 5 ++---
.../org/apache/druid/query/DoubleStorageTest.java | 3 +--
.../query/PrioritizedExecutorServiceTest.java | 3 +--
.../druid/query/QueryInterruptedExceptionTest.java | 3 +--
.../query/aggregation/AggregationTestHelper.java | 7 +++----
.../groupby/GroupByQueryRunnerFactoryTest.java | 4 +---
.../org/apache/druid/segment/IndexBuilder.java | 7 +++----
.../segment/IndexMergerV9WithSpatialIndexTest.java | 9 ++++-----
.../segment/ReferenceCountingSegmentTest.java | 5 ++---
.../apache/druid/segment/SchemalessIndexTest.java | 23 +++++++++++-----------
.../java/org/apache/druid/segment/TestIndex.java | 7 +++----
.../segment/data/BenchmarkIndexibleWrites.java | 3 +--
.../druid/segment/data/IncrementalIndexTest.java | 7 +++----
.../segment/filter/SpatialFilterBonusTest.java | 9 ++++-----
.../druid/segment/filter/SpatialFilterTest.java | 9 ++++-----
.../OnheapIncrementalIndexBenchmark.java | 3 +--
.../client/AbstractCuratorServerInventoryView.java | 7 +++----
.../apache/druid/client/CachingQueryRunner.java | 3 +--
.../org/apache/druid/client/DirectDruidClient.java | 13 ++++++------
.../apache/druid/client/JsonParserIterator.java | 3 +--
.../apache/druid/client/cache/MemcachedCache.java | 9 ++++-----
.../client/indexing/HttpIndexingServiceClient.java | 5 ++---
.../druid/curator/announcement/Announcer.java | 9 ++++-----
.../discovery/CuratorDruidLeaderSelector.java | 5 ++---
.../discovery/CuratorDruidNodeAnnouncer.java | 3 +--
.../CuratorDruidNodeDiscoveryProvider.java | 3 +--
.../curator/discovery/CuratorServiceAnnouncer.java | 3 +--
.../druid/curator/discovery/DiscoveryModule.java | 3 +--
.../druid/guice/FireDepartmentsProvider.java | 3 +--
.../druid/guice/http/JettyHttpClientModule.java | 5 ++---
.../druid/initialization/Initialization.java | 5 ++---
.../IndexerSQLMetadataStorageCoordinator.java | 5 ++---
.../druid/metadata/SQLMetadataConnector.java | 6 ++++--
.../druid/metadata/SQLMetadataRuleManager.java | 7 +++----
.../metadata/SQLMetadataRuleManagerProvider.java | 3 +--
.../druid/metadata/SQLMetadataSegmentManager.java | 3 +--
.../metadata/SQLMetadataStorageActionHandler.java | 2 ++
.../metadata/SQLMetadataSupervisorManager.java | 9 ++++-----
.../storage/derby/DerbyMetadataStorage.java | 7 +++----
.../loading/LocalFileTimestampVersionFinder.java | 3 +--
.../druid/segment/realtime/RealtimeManager.java | 5 ++---
.../realtime/appenderator/AppenderatorImpl.java | 11 +++++------
.../realtime/appenderator/AppenderatorPlumber.java | 3 +--
.../appenderator/BaseAppenderatorDriver.java | 3 ++-
.../firehose/CombiningFirehoseFactory.java | 5 ++---
.../segment/realtime/plumber/RealtimePlumber.java | 5 ++---
.../druid/server/AsyncQueryForwardingServlet.java | 3 +--
.../org/apache/druid/server/QueryResource.java | 5 ++---
.../server/audit/SQLAuditManagerProvider.java | 3 +--
.../coordination/BatchDataSegmentAnnouncer.java | 9 ++++-----
.../CuratorDataSegmentServerAnnouncer.java | 3 +--
.../coordination/SegmentLoadDropHandler.java | 4 ++--
.../druid/server/coordination/ZkCoordinator.java | 6 +++---
.../druid/server/coordinator/DruidCoordinator.java | 5 ++---
.../server/coordinator/HttpLoadQueuePeon.java | 3 +--
.../druid/server/http/CoordinatorRedirectInfo.java | 3 +--
.../announcer/ListenerResourceAnnouncer.java | 3 +--
.../server/log/ComposingRequestLoggerProvider.java | 2 +-
.../apache/druid/server/log/FileRequestLogger.java | 5 ++---
.../org/apache/druid/server/security/TLSUtils.java | 5 ++---
.../partition/HashBasedNumberedShardSpec.java | 3 +--
.../druid/client/CachingClusteredClientTest.java | 3 +--
.../client/BatchServerInventoryViewTest.java | 3 +--
.../org/apache/druid/curator/CuratorTestBase.java | 13 ++++++------
.../granularity/ArbitraryGranularityTest.java | 3 +--
.../granularity/UniformGranularityTest.java | 3 +--
.../segment/realtime/RealtimeManagerTest.java | 3 +--
.../org/apache/druid/server/QueryResourceTest.java | 9 ++++-----
.../server/coordination/ServerManagerTest.java | 7 +++----
.../BatchDataSegmentAnnouncerTest.java | 3 +--
.../druid/server/initialization/BaseJettyTest.java | 3 +--
.../druid/server/initialization/JettyQosTest.java | 5 ++---
.../druid/server/initialization/JettyTest.java | 3 +--
.../apache/druid/cli/CliInternalHadoopIndexer.java | 5 ++---
.../main/java/org/apache/druid/cli/CliPeon.java | 4 ++--
.../java/org/apache/druid/cli/DumpSegment.java | 9 ++++-----
.../java/org/apache/druid/cli/GuiceRunnable.java | 5 ++---
.../org/apache/druid/cli/PullDependencies.java | 9 ++++-----
.../java/org/apache/druid/cli/ServerRunnable.java | 3 +--
.../org/apache/druid/cli/ValidateSegments.java | 3 +--
.../druid/cli/validate/DruidJsonValidator.java | 3 ++-
.../org/apache/druid/cli/PullDependenciesTest.java | 3 +--
.../org/apache/druid/sql/avatica/DruidMeta.java | 3 +--
.../apache/druid/sql/avatica/DruidStatement.java | 9 ++++-----
.../org/apache/druid/sql/calcite/rel/DruidRel.java | 3 +--
.../druid/sql/calcite/view/DruidViewMacro.java | 3 +--
.../org/apache/druid/sql/http/SqlResource.java | 5 ++---
.../druid/sql/avatica/DruidAvaticaHandlerTest.java | 3 +--
.../druid/sql/calcite/util/CalciteTests.java | 5 ++---
229 files changed, 462 insertions(+), 646 deletions(-)
diff --git a/benchmarks/src/main/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java b/benchmarks/src/main/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java
index 9a13f7c..f1b2001 100644
--- a/benchmarks/src/main/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java
+++ b/benchmarks/src/main/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.io.Files;
import org.apache.commons.io.FileUtils;
import org.apache.druid.benchmark.datagen.BenchmarkDataGenerator;
@@ -442,7 +441,7 @@ public class GroupByTypeInterfaceBenchmark
}
catch (IOException e) {
log.warn(e, "Failed to tear down, temp dir was: %s", tmpDir);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java b/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
index fc233cc..6d2b681 100644
--- a/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
+++ b/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
@@ -19,7 +19,6 @@
package org.apache.druid.benchmark.datagen;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.io.Files;
@@ -170,7 +169,7 @@ public class SegmentGenerator implements Closeable
return merged;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/benchmarks/src/main/java/org/apache/druid/benchmark/query/GroupByBenchmark.java b/benchmarks/src/main/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
index 4fd2c1e..b4b9d62 100644
--- a/benchmarks/src/main/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
+++ b/benchmarks/src/main/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
@@ -535,7 +534,7 @@ public class GroupByBenchmark
}
catch (IOException e) {
log.warn(e, "Failed to tear down, temp dir was: %s", tmpDir);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
index 04e18b5..786b182 100644
--- a/codestyle/checkstyle.xml
+++ b/codestyle/checkstyle.xml
@@ -204,6 +204,12 @@
<property name="message" value="Use org.apache.druid.server.http.HttpMediaType#TEXT_PLAIN_UTF8 instead"/>
</module>
+ <module name="Regexp">
+ <property name="format" value='^Throwables.propagate\('/>
+ <property name="illegalPattern" value="true"/>
+ <property name="message" value="Throwables.propagate() shouldn't be used in new code"/>
+ </module>
+
<module name="PackageName">
<property name="format" value="^org.apache.druid.*$"/>
</module>
diff --git a/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java b/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
index 7c861a9..7c3f7aa 100644
--- a/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
+++ b/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
@@ -20,7 +20,6 @@
package org.apache.druid.collections;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.Ordering;
import org.apache.druid.java.util.common.guava.Accumulator;
import org.apache.druid.java.util.common.guava.CloseQuietly;
@@ -116,7 +115,7 @@ public class OrderedMergeSequence<T> implements Sequence<T>
retVal.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return null;
} else {
@@ -165,7 +164,7 @@ public class OrderedMergeSequence<T> implements Sequence<T>
yielder.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
} else {
pQueue.add(yielder);
diff --git a/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java b/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
index eaa22a5..c721b85 100644
--- a/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
+++ b/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
@@ -19,7 +19,6 @@
package org.apache.druid.collections;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.logger.Logger;
import sun.misc.Cleaner;
@@ -137,7 +136,7 @@ public class ReferenceCountingResourceHolder<T> implements ResourceHolder<T>
closer.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/common/config/ConfigManager.java b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java
index 1510864..578a7f5 100644
--- a/core/src/main/java/org/apache/druid/common/config/ConfigManager.java
+++ b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java
@@ -20,7 +20,6 @@
package org.apache.druid.common.config;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.concurrent.ScheduledExecutors;
import org.apache.druid.java.util.common.lifecycle.LifecycleStart;
@@ -159,10 +158,10 @@ public class ConfigManager
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (ExecutionException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java b/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
index 69c6b60..32d7649 100644
--- a/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
+++ b/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
@@ -22,7 +22,6 @@ package org.apache.druid.common.config;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.audit.AuditEntry;
import org.apache.druid.audit.AuditInfo;
@@ -94,7 +93,7 @@ public class JacksonConfigManager
return jsonMapper.writeValueAsBytes(obj);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -105,7 +104,7 @@ public class JacksonConfigManager
return jsonMapper.writeValueAsString(obj);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -120,7 +119,7 @@ public class JacksonConfigManager
return jsonMapper.readValue(bytes, clazz);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
@@ -137,7 +136,7 @@ public class JacksonConfigManager
return jsonMapper.writeValueAsBytes(obj);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -148,7 +147,7 @@ public class JacksonConfigManager
return jsonMapper.writeValueAsString(obj);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -163,7 +162,7 @@ public class JacksonConfigManager
return jsonMapper.readValue(bytes, clazz);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
diff --git a/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java b/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
index 8ab01e1..cdfad64 100644
--- a/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
+++ b/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
@@ -19,7 +19,6 @@
package org.apache.druid.common.config;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.util.Cancellable;
@@ -184,7 +183,7 @@ public class Log4jShutdown implements ShutdownCallbackRegistry, LifeCycle
}
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return current;
diff --git a/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
index c53c988..ea6ac62 100644
--- a/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
+++ b/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
@@ -20,7 +20,6 @@
package org.apache.druid.data.input.impl;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
@@ -82,7 +81,7 @@ public abstract class AbstractTextFilesFirehoseFactory<T>
"Exception reading object[%s]",
object
);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
},
diff --git a/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
index 7d3138e..96719bd 100644
--- a/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
+++ b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
@@ -20,7 +20,6 @@
package org.apache.druid.data.input.impl.prefetch;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.logger.Logger;
@@ -224,7 +223,7 @@ public abstract class Fetcher<T> implements Iterator<OpenedObject<T>>
}
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
final FetchedFile<T> maybeCached = cacheIfPossible(fetchedFile);
@@ -252,7 +251,7 @@ public abstract class Fetcher<T> implements Iterator<OpenedObject<T>>
return new OpenedObject<>(cached);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
} else {
final T object = objects.get(nextFetchIndex);
diff --git a/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java b/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java
index e98f8d0..a39b189 100644
--- a/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java
+++ b/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java
@@ -27,7 +27,6 @@ import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import com.google.inject.ProvisionException;
@@ -167,7 +166,7 @@ public class JsonConfigurator
}
}
catch (NoSuchFieldException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
messages.add(StringUtils.format("%s - %s", path.toString(), violation.getMessage()));
diff --git a/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java b/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java
index 1ba63c1..7be41a8 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.common;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
@@ -85,7 +84,7 @@ public class FileUtils
return new FileCopyResult(outFile);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java b/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
index 6598352..9d16bc6 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
@@ -93,7 +93,7 @@ public class RetryUtils
awaitNextRetry(e, messageOnRetry, nTry, maxRetries, nTry <= quietTries);
} else {
Throwables.propagateIfInstanceOf(e, Exception.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
index 3e4c08e..4bb138b 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.common;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSink;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
@@ -118,7 +117,7 @@ public class StreamUtils
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
index dd5143d..30f5ab8 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.common;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import javax.annotation.Nullable;
import java.io.UnsupportedEncodingException;
@@ -80,7 +79,7 @@ public class StringUtils
}
catch (UnsupportedEncodingException e) {
// Should never happen
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -103,7 +102,7 @@ public class StringUtils
}
catch (UnsupportedEncodingException e) {
// Should never happen
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
index ced354e..678c068 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
@@ -19,7 +19,6 @@
package org.apache.druid.java.util.common.concurrent;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
import java.util.concurrent.ExecutorService;
@@ -47,7 +46,7 @@ public class ExecutorServices
);
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return service;
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
index 62f9f99..95ebe80 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
@@ -19,8 +19,6 @@
package org.apache.druid.java.util.common.guava;
-import com.google.common.base.Throwables;
-
import java.io.Closeable;
import java.io.IOException;
@@ -93,7 +91,7 @@ public class ConcatSequence<T> implements Sequence<T>
yielder.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
yielderYielder = yielderYielder.next(null);
@@ -114,7 +112,7 @@ public class ConcatSequence<T> implements Sequence<T>
yielder.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return makeYielder(yielderYielder.next(null), nextInit, accumulator);
diff --git a/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
index 287fc62..3624969 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.common.guava;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.Ordering;
import org.apache.druid.java.util.common.io.Closer;
@@ -110,7 +109,7 @@ public class MergeSequence<T> extends YieldingSequenceBase<T>
yielder.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
} else {
pQueue.add(yielder);
diff --git a/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
index 2fe43bf..39889fc 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
@@ -59,14 +59,15 @@ final class WrappingSequence<T> implements Sequence<T>
catch (Exception e) {
t.addSuppressed(e);
}
- throw Throwables.propagate(t);
+ Throwables.propagateIfPossible(t);
+ throw new RuntimeException(t);
}
// "Normal" close
try {
wrapper.after(true, null);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return result;
}
@@ -96,7 +97,8 @@ final class WrappingSequence<T> implements Sequence<T>
catch (Exception e) {
t.addSuppressed(e);
}
- throw Throwables.propagate(t);
+ Throwables.propagateIfPossible(t);
+ throw new RuntimeException(t);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
index ed442db..e2d6373 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
@@ -62,7 +62,7 @@ final class WrappingYielder<OutType> implements Yielder<OutType>
catch (Exception e) {
t.addSuppressed(e);
}
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
}
@@ -89,7 +89,7 @@ final class WrappingYielder<OutType> implements Yielder<OutType>
t.addSuppressed(e);
}
Throwables.propagateIfInstanceOf(t, IOException.class);
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
// "Normal" close
try {
@@ -97,7 +97,7 @@ final class WrappingYielder<OutType> implements Yielder<OutType>
}
catch (Exception e) {
Throwables.propagateIfInstanceOf(e, IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
index 1d7e2cd..f12d5d1 100644
--- a/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
@@ -74,7 +74,7 @@ public class Yielders
}
catch (Exception e) {
Throwables.propagateIfInstanceOf(e, IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
index f651968..85ad787 100644
--- a/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
+++ b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.primitives.Ints;
import io.netty.handler.codec.http.HttpHeaders;
import org.apache.druid.concurrent.ConcurrentAwaitableCounter;
@@ -276,7 +275,7 @@ public class HttpPostEmitter implements Flushable, Closeable, Emitter
return jsonMapper.writeValueAsBytes(event);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
index 8e4db9e..8a41362 100644
--- a/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
+++ b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.emitter.core;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
@@ -177,7 +176,7 @@ public class ParametrizedUriEmitter implements Flushable, Closeable, Emitter
if (thrown != null) {
e.addSuppressed(thrown);
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
if (thrown == null) {
thrown = e;
@@ -189,7 +188,7 @@ public class ParametrizedUriEmitter implements Flushable, Closeable, Emitter
}
}
if (thrown != null) {
- throw Throwables.propagate(thrown);
+ throw new RuntimeException(thrown);
}
}
diff --git a/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
index 0fa5361..d425039 100644
--- a/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
+++ b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
@@ -19,7 +19,6 @@
package org.apache.druid.java.util.http.client;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.druid.java.util.common.guava.CloseQuietly;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
@@ -106,7 +105,7 @@ public class HttpClientInit
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -151,22 +150,22 @@ public class HttpClientInit
return sslContext;
}
catch (CertificateException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (NoSuchAlgorithmException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (KeyStoreException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (KeyManagementException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (FileNotFoundException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
CloseQuietly.close(in);
@@ -223,7 +222,7 @@ public class HttpClientInit
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return bootstrap;
diff --git a/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
index 40c491e..00dfab7 100644
--- a/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
+++ b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
@@ -79,7 +79,7 @@ public class ResourcePool<K, V> implements Closeable
holder = pool.get(key);
}
catch (ExecutionException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final V value = holder.get();
@@ -227,7 +227,8 @@ public class ResourcePool<K, V> implements Closeable
deficit++;
this.notifyAll();
}
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
return retVal;
diff --git a/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
index cd6a0ce..203a0d2 100644
--- a/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
+++ b/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
@@ -19,7 +19,6 @@
package org.apache.druid.java.util.http.client.response;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import org.apache.druid.java.util.common.logger.Logger;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -63,7 +62,7 @@ public class SequenceInputStreamResponseHandler implements HttpResponseHandler<I
catch (InterruptedException e) {
log.error(e, "Queue appending interrupted");
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
byteCount.addAndGet(response.getContent().readableBytes());
return ClientResponse.finished(
@@ -89,7 +88,7 @@ public class SequenceInputStreamResponseHandler implements HttpResponseHandler<I
catch (InterruptedException e) {
log.warn(e, "Thread interrupted while taking from queue");
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -115,7 +114,7 @@ public class SequenceInputStreamResponseHandler implements HttpResponseHandler<I
catch (InterruptedException e) {
log.warn(e, "Thread interrupted while adding to queue");
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
byteCount.addAndGet(bytes);
} else {
@@ -137,12 +136,12 @@ public class SequenceInputStreamResponseHandler implements HttpResponseHandler<I
catch (InterruptedException e) {
log.warn(e, "Thread interrupted while adding to queue");
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (IOException e) {
// This should never happen
log.wtf(e, "The empty stream threw an IOException");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
log.debug("Done after adding %d bytes of streams", byteCount.get());
diff --git a/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java b/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
index 5dbf767..26ff73f 100644
--- a/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
+++ b/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
@@ -19,7 +19,6 @@
package org.apache.druid.java.util.metrics;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.StreamUtils;
import org.apache.druid.java.util.common.logger.Logger;
import org.hyperic.jni.ArchLoaderException;
@@ -57,7 +56,7 @@ public class SigarUtil
}
}
catch (ArchNotSupportedException | ArchLoaderException | IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java b/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java
index 8634411..de76af7 100644
--- a/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java
+++ b/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.concurrent;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.druid.java.util.common.concurrent.Execs;
import org.apache.druid.java.util.common.logger.Logger;
@@ -89,7 +88,7 @@ public class ExecsTest
taskCompletedSignal.countDown();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
log.info("Completed task: %s", taskID);
}
diff --git a/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
index 1746329..d68f989 100644
--- a/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
+++ b/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.java.util.common;
import com.google.common.base.Predicates;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSink;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
@@ -78,7 +77,7 @@ public class CompressionUtilsTest
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
content = builder.toString();
expected = StringUtils.toUtf8(content);
@@ -90,7 +89,7 @@ public class CompressionUtilsTest
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
gzBytes = gzByteStream.toByteArray();
}
diff --git a/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
index 411b592..e719585 100644
--- a/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
+++ b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
@@ -19,7 +19,6 @@
package org.apache.druid.java.util.emitter.core;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.asynchttpclient.ListenableFuture;
import org.asynchttpclient.Request;
@@ -51,7 +50,7 @@ public abstract class GoHandler
}
catch (Throwable e) {
succeeded = false;
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java
index 5e27f53..55678f3 100644
--- a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java
+++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java
@@ -19,7 +19,6 @@
package org.apache.druid.storage.azure;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.microsoft.azure.storage.StorageException;
@@ -55,7 +54,7 @@ public class AzureByteSource extends ByteSource
if (AzureUtils.AZURE_RETRY.apply(e)) {
throw new IOException("Recoverable exception", e);
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java
index 006749b..2d2a8bc 100644
--- a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java
+++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java
@@ -19,7 +19,6 @@
package org.apache.druid.storage.azure;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
@@ -158,7 +157,7 @@ public class AzureDataSegmentPusher implements DataSegmentPusher
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
if (zipOutFile != null) {
diff --git a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java
index 451b41c..1b5ab36 100644
--- a/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java
+++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java
@@ -20,7 +20,6 @@
package org.apache.druid.storage.azure;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.google.inject.Inject;
import com.microsoft.azure.storage.StorageException;
@@ -77,7 +76,7 @@ public class AzureTaskLogs implements TaskLogs
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java
index 04287fe..eaa602a 100644
--- a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java
+++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java
@@ -19,7 +19,6 @@
package org.apache.druid.storage.cloudfiles;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import org.jclouds.io.Payload;
@@ -65,7 +64,7 @@ public class CloudFilesByteSource extends ByteSource
if (CloudFilesUtils.CLOUDFILESRETRY.apply(e)) {
throw new IOException("Recoverable exception", e);
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java
index c99a095..50d0927 100644
--- a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java
+++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java
@@ -20,7 +20,6 @@
package org.apache.druid.storage.cloudfiles;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.logger.Logger;
@@ -124,7 +123,7 @@ public class CloudFilesDataSegmentPusher implements DataSegmentPusher
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
if (zipOutFile != null) {
diff --git a/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java
index d4589c0..896209a 100644
--- a/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java
+++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java
@@ -22,7 +22,6 @@ package org.apache.druid.storage.google;
import com.google.api.client.http.FileContent;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
@@ -127,7 +126,7 @@ public class GoogleDataSegmentPusher implements DataSegmentPusher
return outSegment;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
if (indexFile != null) {
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
index 1c71dde..d7edfaa 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.guice.annotations.Self;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.logger.Logger;
@@ -606,7 +605,7 @@ public class KerberosAuthenticator implements Authenticator
}
}
catch (Exception ex) {
- Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
index 7cb79d7..6a7e693 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
@@ -19,7 +19,6 @@
package org.apache.druid.security.kerberos;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -149,7 +148,7 @@ public class KerberosHttpClient extends AbstractHttpClient
}, exec);
}
catch (Throwable e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
index 5017ce2..5dd29ad 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
@@ -20,7 +20,6 @@
package org.apache.druid.storage.hdfs;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.FileUtils;
@@ -215,7 +214,7 @@ public class HdfsDataSegmentPuller implements URIDataPuller
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
} else if (CompressionUtils.isZip(path.getName())) {
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
index c8560c6..d0530d2 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
@@ -19,7 +19,6 @@
package org.apache.druid.storage.hdfs;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.data.SearchableVersionedDataFinder;
import org.apache.druid.java.util.common.RetryUtils;
@@ -94,7 +93,7 @@ public class HdfsFileTimestampVersionFinder extends HdfsDataSegmentPuller implem
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
index f56a4d0..95cd12f 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
@@ -21,7 +21,6 @@ package org.apache.druid.storage.hdfs;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.Module;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
import com.google.inject.Inject;
@@ -106,7 +105,7 @@ public class HdfsStorageDruidModule implements DruidModule
FileSystem.get(conf);
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
finally {
Thread.currentThread().setContextClassLoader(currCtxCl);
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java b/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java
index a408032..e79c1be 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java
@@ -19,7 +19,6 @@
package /*CHECKSTYLE.OFF: PackageName*/org.apache.hadoop.fs/*CHECKSTYLE.ON: PackageName*/;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.logger.Logger;
import java.io.IOException;
@@ -64,7 +63,7 @@ public class HadoopFsWrapper
log.info(ex, "Destination exists while renaming [%s] to [%s]", from, to);
return false;
} else {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
catch (NoSuchMethodException | IllegalAccessException ex) {
@@ -72,7 +71,7 @@ public class HadoopFsWrapper
for (Method method : fs.getClass().getDeclaredMethods()) {
log.error(method.toGenericString());
}
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
index f1045ac..a14668b 100644
--- a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
+++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import org.apache.druid.indexer.Bucket;
@@ -422,7 +421,7 @@ public class HdfsDataSegmentPusherTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
//DataSchema dataSchema = new DataSchema("dataSource", null, null, Gra)
@@ -511,7 +510,7 @@ public class HdfsDataSegmentPusherTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
HadoopDruidIndexerConfig cfg = new HadoopDruidIndexerConfig(
diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
index cbeb028..9e4bea5 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.Bytes;
@@ -360,7 +359,7 @@ public class KafkaLookupExtractorFactoryTest
Thread.currentThread().join();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
throw new RuntimeException("shouldn't make it here");
}
diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
index 8e27958..a830ba5 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
@@ -20,7 +20,6 @@
package org.apache.druid.query.lookup;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
import com.google.inject.Injector;
@@ -160,7 +159,7 @@ public class TestKafkaExtractionCluster
Thread.sleep(ms);
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java
index 1082473..b4fa5cc 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java
@@ -918,7 +918,7 @@ public class LegacyKafkaIndexTaskRunner extends SeekableStreamIndexTaskRunner<In
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -1170,7 +1170,7 @@ public class LegacyKafkaIndexTaskRunner extends SeekableStreamIndexTaskRunner<In
return Response.ok().entity(objectMapper.writeValueAsString(getCurrentOffsets())).build();
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
index 461ac9e..f600946 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
-import com.google.common.base.Throwables;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -2882,7 +2881,7 @@ public class KafkaIndexTaskTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
index a5e75c9..54b494d 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.kafka;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -99,7 +98,7 @@ public class KafkaRecordSupplierTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTest.java
index 857b4a7..da27cba 100644
--- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTest.java
+++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTest.java
@@ -3216,7 +3216,7 @@ public class KinesisIndexTaskTest extends EasyMockSupport
));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplierTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplierTest.java
index dd99920..bd1fbe8 100644
--- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplierTest.java
+++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplierTest.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.kinesis.model.Record;
import com.amazonaws.services.kinesis.model.Shard;
import com.amazonaws.services.kinesis.model.StreamDescription;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -135,7 +134,7 @@ public class KinesisRecordSupplierTest extends EasyMockSupport
));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
index 2ceadb5..5e28b70 100644
--- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
+++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexing.kinesis.supervisor;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -3582,7 +3581,7 @@ public class KinesisSupervisorTest extends EasyMockSupport
));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java
index 5efe002..416f68d 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.logger.Logger;
@@ -120,7 +119,7 @@ public class NamespaceLookupExtractorFactory implements LookupExtractorFactory
}
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -132,7 +131,7 @@ public class NamespaceLookupExtractorFactory implements LookupExtractorFactory
writeLock.lockInterruptibly();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try {
if (entry == null) {
@@ -197,7 +196,7 @@ public class NamespaceLookupExtractorFactory implements LookupExtractorFactory
readLock.lockInterruptibly();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try {
if (entry == null) {
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
index 2ed7719..d828ca7 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.guice.annotations.Json;
@@ -619,7 +618,7 @@ public class UriExtractionNamespace implements ExtractionNamespace
return jsonFactory.createParser(input).readValueAs(JacksonUtils.TYPE_REFERENCE_MAP_STRING_STRING);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java
index 40a0599..f8a965d 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java
@@ -216,7 +216,7 @@ public final class CacheScheduler
t.addSuppressed(e);
}
if (Thread.currentThread().isInterrupted() || t instanceof InterruptedException || t instanceof Error) {
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
}
}
@@ -448,7 +448,7 @@ public final class CacheScheduler
catch (Exception e) {
log.error(e, "Error emitting namespace stats");
if (Thread.currentThread().isInterrupted()) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java
index 7f3f775..867822c 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java
@@ -20,7 +20,6 @@
package org.apache.druid.server.lookup.namespace.cache;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.druid.java.util.common.concurrent.ExecutorServices;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
@@ -73,7 +72,7 @@ public abstract class NamespaceExtractionCacheManager
catch (Exception e) {
log.error(e, "Error emitting namespace stats");
if (Thread.currentThread().isInterrupted()) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java
index 0488aea..8a4615d 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java
@@ -145,7 +145,7 @@ public class OffHeapNamespaceExtractionCacheManager extends NamespaceExtractionC
log.info("Using file [%s] for mapDB off heap namespace cache", tmpFile.getAbsolutePath());
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
mmapDB = DBMaker
.newFileDB(tmpFile)
@@ -182,7 +182,7 @@ public class OffHeapNamespaceExtractionCacheManager extends NamespaceExtractionC
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
index 6e42a35..6010966 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.query.lookup.namespace;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -80,7 +79,7 @@ public class JSONFlatDataParserTest
return MAPPER.writeValueAsString(input);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
index 8f8b507..0cf0bb8 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.server.lookup.namespace;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.data.SearchableVersionedDataFinder;
@@ -97,7 +96,7 @@ public class UriCacheGeneratorTest
);
}
catch (URISyntaxException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return newURI;
}
@@ -133,7 +132,7 @@ public class UriCacheGeneratorTest
return new FileOutputStream(outFile);
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
}
@@ -163,7 +162,7 @@ public class UriCacheGeneratorTest
};
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
}
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
index 41a8616..e7a9c28 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.server.lookup.namespace.cache;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
@@ -263,13 +262,13 @@ public class CacheSchedulerTest
testDelete();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -333,7 +332,7 @@ public class CacheSchedulerTest
}
catch (ExecutionException e) {
if (!future.isCancelled()) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
index deef14e..096fced 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.lookup.namespace.cache;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
@@ -189,7 +188,7 @@ public class JdbcExtractionNamespaceTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -237,7 +236,7 @@ public class JdbcExtractionNamespaceTest
lifecycle.start();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
closer.register(
new Closeable()
@@ -295,7 +294,7 @@ public class JdbcExtractionNamespaceTest
closer.close();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java
index c22bb45..6342bf5 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.server.lookup.namespace.cache;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
@@ -92,7 +91,7 @@ public class NamespaceExtractionCacheManagersTest
thunder.await();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
for (int i = 0; i < 1000; ++i) {
CacheHandler cacheHandler = manager.createCache();
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
index bbfe2ef..0f4d298 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
@@ -142,7 +142,7 @@ public class S3DataSegmentMover implements DataSegmentMover
catch (Exception e) {
Throwables.propagateIfInstanceOf(e, AmazonServiceException.class);
Throwables.propagateIfInstanceOf(e, SegmentLoadingException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java
index 7ff688f..9c33b09 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java
@@ -25,7 +25,6 @@ import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
import com.google.inject.Inject;
@@ -100,7 +99,7 @@ public class S3DataSegmentPuller implements URIDataPuller
throw new IOException("Recoverable exception", e);
}
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
@@ -315,7 +314,7 @@ public class S3DataSegmentPuller implements URIDataPuller
throw new SegmentLoadingException(e, "S3 fail! Key[%s]", coords);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java
index 2e059bb..8ec1b2a 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java
@@ -21,7 +21,6 @@ package org.apache.druid.storage.s3;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
@@ -107,7 +106,7 @@ public class S3DataSegmentPusher implements DataSegmentPusher
throw new IOException(e);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
log.info("Deleting temporary cached index.zip");
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java
index 67ff682..b437c62 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java
@@ -142,7 +142,7 @@ public class S3TaskLogs implements TaskLogs
}
catch (Exception e) {
Throwables.propagateIfInstanceOf(e, IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java
index 3b7598c..5ef94c0 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java
@@ -20,7 +20,6 @@
package org.apache.druid.storage.s3;
import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.data.SearchableVersionedDataFinder;
import org.apache.druid.java.util.common.RetryUtils;
@@ -93,7 +92,7 @@ public class S3TimestampVersionedDataFinder extends S3DataSegmentPuller implemen
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
index 976b78d..b4b0d8e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
@@ -21,7 +21,6 @@ package org.apache.druid.indexer;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.hash.HashFunction;
@@ -220,7 +219,7 @@ public class DetermineHashedPartitionsJob implements Jobby
return true;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
index d8c8ae2..7dad5c6 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
@@ -24,7 +24,6 @@ import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -272,7 +271,7 @@ public class DeterminePartitionsJob implements Jobby
return true;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
index 22266ac..7e02f82 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
@@ -28,7 +28,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.inject.Binder;
@@ -168,7 +167,7 @@ public class HadoopDruidIndexerConfig
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -182,7 +181,7 @@ public class HadoopDruidIndexerConfig
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -199,7 +198,7 @@ public class HadoopDruidIndexerConfig
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -581,7 +580,7 @@ public class HadoopDruidIndexerConfig
conf.set(HadoopDruidIndexerConfig.CONFIG_PROPERTY, HadoopDruidIndexerConfig.JSON_MAPPER.writeValueAsString(this));
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
index c6cec97..0fb017e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
@@ -21,7 +21,6 @@ package org.apache.druid.indexer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -129,10 +128,10 @@ public class IndexGeneratorJob implements Jobby
+ " either there was no input data to process or all the input events were discarded due to some error",
e.getMessage()
);
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
List<DataSegment> publishedSegments = publishedSegmentsBuilder.build();
@@ -727,7 +726,7 @@ public class IndexGeneratorJob implements Jobby
}
catch (Exception e) {
log.error(e, "persist index error");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
// close this index
@@ -856,7 +855,7 @@ public class IndexGeneratorJob implements Jobby
}
}
catch (ExecutionException | TimeoutException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
index.close();
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
index a87e26f..1981099 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexer;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.io.Files;
import org.apache.druid.indexer.updater.HadoopDruidConverterConfig;
import org.apache.druid.java.util.common.DateTimes;
@@ -174,7 +173,7 @@ public class JobHelper
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -344,7 +343,7 @@ public class JobHelper
config.addInputPaths(job);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -673,7 +672,7 @@ public class JobHelper
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -858,7 +857,7 @@ public class JobHelper
}
catch (Exception e) {
log.error(e, "Failed to cleanup path[%s]", path);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
index 586f689..85d478c 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexer.hadoop;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
@@ -104,7 +103,7 @@ public class DatasourceRecordReader extends RecordReader<NullWritable, InputRow>
);
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
}
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java
index 95019a7..a44fc80 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexer.updater;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -205,7 +204,7 @@ public class HadoopConverterJob
);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -320,13 +319,13 @@ public class HadoopConverterJob
}
}
catch (final IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try (final InputStream stream = fs.open(input)) {
return HadoopDruidConverterConfig.jsonMapper.readValue(stream, DataSegment.class);
}
catch (final IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -344,9 +343,9 @@ public class HadoopConverterJob
}
}
catch (InterruptedException | ClassNotFoundException e) {
- RuntimeException exception = Throwables.propagate(e);
- throwable = exception;
- throw exception;
+ RuntimeException r = new RuntimeException(e);
+ throwable = r;
+ throw r;
}
catch (Throwable t) {
throwable = t;
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
index 6a40525..a885c5f 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexer;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -103,7 +102,7 @@ public class BatchDeltaIngestionTest
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java
index 83e4c8a..3b17d41 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexer;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import org.apache.druid.indexer.partitions.HashedPartitionsSpec;
import org.apache.druid.indexer.partitions.PartitionsSpec;
import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec;
@@ -71,7 +70,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final UniformGranularitySpec granularitySpec = (UniformGranularitySpec) schema.getDataSchema().getGranularitySpec();
@@ -111,7 +110,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final UniformGranularitySpec granularitySpec = (UniformGranularitySpec) schema.getDataSchema().getGranularitySpec();
@@ -142,7 +141,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final PartitionsSpec partitionsSpec = schema.getTuningConfig().getPartitionsSpec();
@@ -188,7 +187,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final PartitionsSpec partitionsSpec = schema.getTuningConfig().getPartitionsSpec();
@@ -261,7 +260,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Assert.assertEquals(
@@ -326,7 +325,7 @@ public class HadoopIngestionSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Assert.assertEquals(
@@ -342,7 +341,7 @@ public class HadoopIngestionSpecTest
return jsonMapper.readValue(jsonMapper.writeValueAsBytes(jsonMapper.readValue(s, klass)), klass);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
index 2d9c9e2..5d863a3 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexer;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.segment.IndexSpec;
@@ -89,7 +88,7 @@ public class HadoopTuningConfigTest
return jsonMapper.readValue(jsonMapper.writeValueAsBytes(jsonMapper.readValue(s, klass)), klass);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
index bb61938..40bc14d 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexer.hadoop;
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.io.Files;
@@ -83,14 +82,14 @@ public class FSSpideringIteratorTest
Assert.assertTrue(files.isEmpty());
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
try {
FileUtils.deleteDirectory(baseDir);
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java
index cebcfba..e8074ea 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexer.partitions;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.junit.Assert;
@@ -48,7 +47,7 @@ public class HashedPartitionsSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Assert.assertEquals(
@@ -94,7 +93,7 @@ public class HashedPartitionsSpecTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Assert.assertEquals(
@@ -136,7 +135,7 @@ public class HashedPartitionsSpecTest
return jsonMapper.readValue(jsonMapper.writeValueAsBytes(jsonMapper.readValue(s, klass)), klass);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java
index d77b6ef..0b2e49d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.indexing.common.TaskLock;
import org.apache.druid.indexing.common.TaskLockType;
import org.apache.druid.indexing.common.task.Task;
@@ -91,7 +90,7 @@ public class LockAcquireAction implements TaskAction<TaskLock>
return result.isOk() ? result.getTaskLock() : null;
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java
index 19046ce..ab3bd21 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.common.actions;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import org.apache.druid.discovery.DruidLeaderClient;
import org.apache.druid.indexing.common.RetryPolicy;
import org.apache.druid.indexing.common.RetryPolicyFactory;
@@ -109,7 +108,7 @@ public class RemoteTaskActionClient implements TaskActionClient
Thread.sleep(sleepTime);
}
catch (InterruptedException e2) {
- throw Throwables.propagate(e2);
+ throw new RuntimeException(e2);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
index a6a58bc..6623483 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexing.common.actions;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.apache.druid.indexing.common.TaskLockType;
@@ -197,7 +196,7 @@ public class SegmentAllocateAction implements TaskAction<SegmentIdWithShardSpec>
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
} else {
log.error(
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
index 8ce5a89..6e0e1d8 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import org.apache.commons.io.FileUtils;
@@ -209,7 +208,7 @@ public class YeOldePlumberSchool implements PlumberSchool
}
catch (Exception e) {
log.warn(e, "Failed to merge and upload");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
try {
@@ -250,7 +249,7 @@ public class YeOldePlumberSchool implements PlumberSchool
}
catch (Exception e) {
log.warn(e, "Failed to spill index[%d]", indexToPersist.getCount());
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java
index 1cb83cb..4f90017 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java
@@ -425,7 +425,7 @@ public class AppenderatorDriverRealtimeIndexTask extends AbstractTask implements
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
index 2031077..768735d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
@@ -21,7 +21,6 @@ package org.apache.druid.indexing.common.task;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.inject.Injector;
@@ -92,7 +91,7 @@ public abstract class HadoopTask extends AbstractTask
return fName.startsWith("druid") && fName.endsWith(".jar") && !fName.endsWith("selfcontained.jar");
}
catch (URISyntaxException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
@@ -217,7 +216,7 @@ public abstract class HadoopTask extends AbstractTask
return (OutputType) method.invoke(null, input);
}
catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException | NoSuchMethodException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
Thread.currentThread().setContextClassLoader(oldLoader);
@@ -245,7 +244,7 @@ public abstract class HadoopTask extends AbstractTask
return clazz.newInstance();
}
catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
Thread.currentThread().setContextClassLoader(oldLoader);
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
index 689ff1a..5263402 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
@@ -1069,7 +1069,7 @@ public class IndexTask extends AbstractTask implements ChatHandler
}
}
catch (TimeoutException | ExecutionException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
index b8fa938..11cd78f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.apache.druid.indexing.common.TaskToolbox;
@@ -86,7 +85,7 @@ public class MergeTask extends MergeTaskBase
return toolbox.getIndexIO().loadIndex(input);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java
index 77ad272..2786805 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.io.FileUtils;
@@ -313,7 +312,7 @@ public class RealtimeIndexTask extends AbstractTask
return lock.getVersion();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
@@ -517,7 +516,7 @@ public class RealtimeIndexTask extends AbstractTask
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
index bae2946..5ccd9d3 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Iterables;
@@ -225,7 +224,7 @@ public class IngestSegmentFirehoseFactory implements FirehoseFactory<InputRowPar
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -240,7 +239,7 @@ public class IngestSegmentFirehoseFactory implements FirehoseFactory<InputRowPar
return new IngestSegmentFirehose(adapters, transformSpec, dims, metricsList, dimFilter);
}
catch (SegmentLoadingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
index d319983..05f2f52 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
@@ -27,7 +27,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -474,7 +473,7 @@ public class ForkingTaskRunner implements TaskRunner, TaskLogStreamer
}
catch (Throwable t) {
log.info(t, "Exception caught during execution");
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
finally {
try {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
index 8690c68..256d62b 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
@@ -146,7 +145,7 @@ public class MetadataTaskStorage implements TaskStorage
if (e instanceof EntryExistsException) {
throw (EntryExistsException) e;
} else {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
index b83ea67..4dd15e0 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
@@ -340,7 +340,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
lifecycleLock.started();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
lifecycleLock.exitStart();
@@ -378,7 +378,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
lifecycleLock.exitStop();
@@ -617,12 +617,12 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
).get();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (ExecutionException e) {
// Unwrap if possible
Throwables.propagateIfPossible(e.getCause(), IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -738,7 +738,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
log.info("Tried to delete status path[%s] that didn't exist! Must've gone away already?", statusPath);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -1047,7 +1047,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
return retVal;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -1086,7 +1086,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
scheduleTasksCleanupForWorker(worker.getHost(), getAssignedTasks(worker));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
try {
@@ -1149,7 +1149,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
}
catch (Exception e) {
log.makeAlert("Exception while cleaning up worker[%s]", worker).emit();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
},
@@ -1263,7 +1263,7 @@ public class RemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return getWorkerFromZK(lazyWorkers.values());
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java
index fd53c76..5347fa6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.overlord;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.client.indexing.IndexingService;
import org.apache.druid.curator.discovery.ServiceAnnouncer;
@@ -152,7 +151,7 @@ public class TaskMaster implements TaskCountStatsProvider
leaderLifecycle.start();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
giant.unlock();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
index afcbdb1..b583d07 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexing.overlord;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -585,7 +584,7 @@ public class TaskQueue
}
catch (Exception e) {
log.warn(e, "Failed to sync tasks from storage!");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
giant.unlock();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java
index 6352b86..e2ec90e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.overlord;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.indexer.TaskLocation;
import org.apache.druid.indexer.TaskStatus;
import org.apache.druid.indexing.worker.Worker;
@@ -111,7 +110,7 @@ public class TaskRunnerUtils
return new URI(StringUtils.format("%s://%s%s", worker.getScheme(), worker.getHost(), path)).toURL();
}
catch (URISyntaxException | MalformedURLException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java
index d9c5c95..eb4d2e3 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.curator.framework.recipes.cache.PathChildrenCache;
@@ -70,7 +69,7 @@ public class ZkWorker implements Closeable
return jsonMapper.readValue(input.getData(), TaskAnnouncement.class);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java
index 6ca47d6..48167b2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import org.apache.druid.guice.annotations.Json;
import org.apache.druid.java.util.common.StringUtils;
@@ -81,7 +80,7 @@ public class GalaxyEC2UserData implements EC2UserData<GalaxyEC2UserData>
return StringUtils.encodeBase64String(jsonMapper.writeValueAsBytes(this));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java
index 5cb99ba..532b2fc 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java
@@ -248,7 +248,7 @@ public class HttpRemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
log.info("Started.");
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
lifecycleLock.exitStart();
@@ -539,7 +539,7 @@ public class HttpRemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
scheduleTasksCleanupForWorker(worker.getHost());
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
checkAndRemoveWorkersFromBlackList();
@@ -597,7 +597,7 @@ public class HttpRemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
}
catch (Exception e) {
log.makeAlert("Exception while cleaning up worker[%s]", workerHostAndPort).emit();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
},
@@ -792,7 +792,7 @@ public class HttpRemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return getLazyWorkers();
@@ -871,12 +871,12 @@ public class HttpRemoteTaskRunner implements WorkerTaskRunner, TaskLogStreamer
).get();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (ExecutionException e) {
// Unwrap if possible
Throwables.propagateIfPossible(e.getCause(), IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java
index d112cb5..0faa6c8 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java
@@ -19,7 +19,6 @@
package org.apache.druid.indexing.overlord.http;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import org.apache.druid.indexing.overlord.TaskMaster;
@@ -70,7 +69,7 @@ public class OverlordRedirectInfo implements RedirectInfo
return new URL(location);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java
index 3f7bde2..f9cc2da 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.indexing.common.task.Task;
import org.apache.druid.indexing.overlord.ImmutableWorkerInfo;
@@ -68,7 +67,7 @@ public class JavaScriptWorkerSelectStrategy implements WorkerSelectStrategy
return ((Invocable) engine).getInterface(SelectorFunction.class);
}
catch (ScriptException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
index b47ec89..3168b89 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
@@ -21,7 +21,6 @@ package org.apache.druid.indexing.overlord.supervisor;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.indexing.overlord.DataSourceMetadata;
import org.apache.druid.java.util.common.Pair;
@@ -302,7 +301,7 @@ public class SupervisorManager
if (persistSpec) {
metadataSupervisorManager.insert(id, new NoopSupervisorSpec(null, spec.getDataSources()));
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
supervisors.put(id, Pair.of(supervisor, spec));
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
index 4fca19d..4fc7640 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
@@ -1230,7 +1230,7 @@ public abstract class SeekableStreamIndexTaskRunner<PartitionIdType, SequenceOff
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -1537,7 +1537,7 @@ public abstract class SeekableStreamIndexTaskRunner<PartitionIdType, SequenceOff
return Response.ok().entity(toolbox.getObjectMapper().writeValueAsString(getCurrentOffsets())).build();
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
index b93d15f..d76cc87 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
@@ -28,7 +28,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -1139,7 +1138,7 @@ public abstract class SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
return;
}
- boolean metadataUpdateSuccess = false;
+ boolean metadataUpdateSuccess;
if (currentMetadata == null) {
metadataUpdateSuccess = true;
} else {
@@ -1149,7 +1148,7 @@ public abstract class SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
}
catch (IOException e) {
log.error("Resetting DataSourceMetadata failed [%s]", e.getMessage());
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
if (metadataUpdateSuccess) {
@@ -1679,7 +1678,7 @@ public abstract class SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
tuningConfig = sortingMapper.writeValueAsString(taskTuningConfig);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
String hashCode = DigestUtils.sha1Hex(dataSchema
@@ -2029,7 +2028,7 @@ public abstract class SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
}
catch (Exception e) {
log.error("Something bad happened [%s]", e.getMessage());
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
if (taskGroup.tasks.isEmpty()) {
@@ -2545,13 +2544,13 @@ public abstract class SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
private void updateLatestOffsetsFromStream() throws InterruptedException
{
synchronized (recordSupplierLock) {
- Set<PartitionIdType> partitionIds = null;
+ Set<PartitionIdType> partitionIds;
try {
partitionIds = recordSupplier.getPartitionIds(ioConfig.getStream());
}
catch (Exception e) {
log.warn("Could not fetch partitions for topic/stream [%s]", ioConfig.getStream());
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Set<StreamPartition<PartitionIdType>> partitions = partitionIds
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
index d3b531a..0d6a4c5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexing.worker.executor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.Inject;
@@ -100,7 +99,7 @@ public class ExecutorLifecycle
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
// Avoid running the same task twice on the same machine by locking the task base directory.
@@ -137,7 +136,7 @@ public class ExecutorLifecycle
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
if (taskExecutorConfig.isParentStreamDefined()) {
@@ -198,7 +197,7 @@ public class ExecutorLifecycle
return taskStatus;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -211,7 +210,7 @@ public class ExecutorLifecycle
statusFuture.get();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
index b809e7a..3155ac9 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.indexing.common.task;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -207,7 +206,7 @@ public class AppenderatorDriverRealtimeIndexTaskTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java
index 2db9272..348c349 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.common.task;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -191,7 +190,7 @@ public class RealtimeIndexTaskTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java
index 8ca24d9..e224b95 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.indexing.firehose;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -215,7 +214,7 @@ public class IngestSegmentFirehoseFactoryTimelineTest
index.add(row);
}
catch (IndexSizeExceededException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -223,7 +222,7 @@ public class IngestSegmentFirehoseFactoryTimelineTest
INDEX_MERGER_V9.persist(index, persistDir, new IndexSpec(), null);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return ImmutableMap.of(
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java
index ffd5d68..593f005 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -218,7 +217,7 @@ public class RemoteTaskRunnerTestUtils
return cf.checkExists().forPath(path) != null;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
index d7e51fa..4e1c66d 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -1259,7 +1258,7 @@ public class TaskLifecycleTest
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java
index 0adcf26..b62a536 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.indexing.overlord.hrtr;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
import com.google.common.base.Predicates;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -1327,7 +1326,7 @@ public class HttpRemoteTaskRunnerTest
Thread.sleep(500);
}
catch (InterruptedException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
if (toImmutable().getCurrCapacityUsed() > worker.getCapacity()) {
@@ -1370,7 +1369,7 @@ public class HttpRemoteTaskRunnerTest
Thread.sleep(100);
}
catch (InterruptedException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
tasksSnapshotRef.get().put(announcement.getTaskId(), announcement);
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
index e4cc628..c120244 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
@@ -21,7 +21,6 @@ package org.apache.druid.testing.clients;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.http.client.HttpClient;
@@ -87,7 +86,7 @@ public abstract class AbstractQueryResourceTestClient<QueryType>
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
index 8c1b5d1..0b9252e 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
@@ -21,7 +21,6 @@ package org.apache.druid.testing.clients;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.StringUtils;
@@ -97,7 +96,7 @@ public class ClientInfoResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
index 04147b0..6974b44 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
@@ -21,7 +21,6 @@ package org.apache.druid.testing.clients;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.RE;
@@ -107,7 +106,7 @@ public class CoordinatorResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return segments;
}
@@ -126,7 +125,7 @@ public class CoordinatorResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return segments;
}
@@ -163,7 +162,7 @@ public class CoordinatorResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return status;
}
@@ -180,7 +179,7 @@ public class CoordinatorResourceTestClient
makeRequest(HttpMethod.DELETE, StringUtils.format("%sdatasources/%s", getCoordinatorURL(), StringUtils.urlEncode(dataSource)));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -198,7 +197,7 @@ public class CoordinatorResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -237,7 +236,7 @@ public class CoordinatorResourceTestClient
return response;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java
index ef13840..2bd7d14 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java
@@ -22,7 +22,6 @@ package org.apache.druid.testing.clients;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.jackson.JacksonUtils;
@@ -109,7 +108,7 @@ public class EventReceiverFirehoseTestClient
return responseData.get("eventCount");
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -156,7 +155,7 @@ public class EventReceiverFirehoseTestClient
return totalEventsPosted;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
index f2e600e..578f8c5 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
@@ -22,7 +22,6 @@ package org.apache.druid.testing.clients;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Predicates;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.client.indexing.TaskStatusResponse;
import org.apache.druid.indexer.TaskState;
@@ -108,7 +107,7 @@ public class OverlordResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -134,7 +133,7 @@ public class OverlordResourceTestClient
return taskStatusResponse.getStatus().getStatusCode();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -173,7 +172,7 @@ public class OverlordResourceTestClient
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -230,7 +229,7 @@ public class OverlordResourceTestClient
return id;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -258,7 +257,7 @@ public class OverlordResourceTestClient
LOG.info("Shutdown supervisor with id[%s]", id);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -274,7 +273,7 @@ public class OverlordResourceTestClient
}
catch (Exception e) {
LOG.error(e, "Exception while sending request");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
index c2ef4c9..798e5ed 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
@@ -19,7 +19,6 @@
package org.apache.druid.testing.utils;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.logger.Logger;
@@ -69,7 +68,7 @@ public class RetryUtil
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
index ed53e3a..f7ad9ff 100644
--- a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
+++ b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
@@ -19,7 +19,6 @@
package /*CHECKSTYLE.OFF: PackageName*/org.testng/*CHECKSTYLE.ON: PackageName*/;
-import com.google.common.base.Throwables;
import com.google.inject.Injector;
import com.google.inject.Key;
import org.apache.druid.java.util.common.StringUtils;
@@ -105,7 +104,7 @@ public class DruidTestRunnerFactory implements ITestRunnerFactory
}
catch (Exception e) {
LOG.error(e, "");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
lifecycle.stop();
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java b/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java
index 233add8..5e6d66b 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.hadoop;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.logger.Logger;
@@ -70,7 +69,7 @@ public class ITHadoopIndexTest extends AbstractIndexerTest
}
catch (Exception e) {
LOG.error("could not read and modify indexer file: %s", e.getMessage());
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try {
@@ -95,7 +94,7 @@ public class ITHadoopIndexTest extends AbstractIndexerTest
}
catch (Exception e) {
LOG.error("data could not be loaded: %s", e.getMessage());
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java
index 7d97dc7..07ec6b6 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.indexer;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.commons.io.IOUtils;
import org.apache.druid.curator.discovery.ServerDiscoveryFactory;
@@ -138,7 +137,7 @@ public abstract class AbstractITRealtimeIndexTaskTest extends AbstractIndexerTes
this.queryHelper.testQueriesFromString(getRouterURL(), queryStr, 2);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
// wait for the task to complete
@@ -164,7 +163,7 @@ public abstract class AbstractITRealtimeIndexTaskTest extends AbstractIndexerTes
this.queryHelper.testQueriesFromString(getRouterURL(), queryStr, 2);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java
index 1282295..1b52fc4 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.indexer;
-import com.google.common.base.Throwables;
import org.apache.druid.curator.discovery.ServerDiscoverySelector;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.ISE;
@@ -71,7 +70,7 @@ public class ITAppenderatorDriverRealtimeIndexTaskTest extends AbstractITRealtim
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try {
reader = new BufferedReader(isr);
@@ -120,7 +119,7 @@ public class ITAppenderatorDriverRealtimeIndexTaskTest extends AbstractITRealtim
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
reader.close();
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java
index 5383ea5..7447b2f 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.indexer;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import kafka.admin.AdminUtils;
import kafka.admin.RackAwareMode;
@@ -204,7 +203,7 @@ public class ITKafkaIndexingServiceTest extends AbstractIndexerTest
producer.send(new ProducerRecord<String, String>(TOPIC_NAME, event)).get();
}
catch (Exception ioe) {
- throw Throwables.propagate(ioe);
+ throw new RuntimeException(ioe);
}
dtLast = dt;
@@ -253,7 +252,7 @@ public class ITKafkaIndexingServiceTest extends AbstractIndexerTest
this.queryHelper.testQueriesFromString(queryStr, 2);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
LOG.info("Shutting down Kafka Supervisor");
@@ -291,7 +290,7 @@ public class ITKafkaIndexingServiceTest extends AbstractIndexerTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
LOG.info("segments are present");
segmentsExist = true;
@@ -301,7 +300,7 @@ public class ITKafkaIndexingServiceTest extends AbstractIndexerTest
this.queryHelper.testQueriesFromString(queryStr, 2);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITNestedQueryPushDownTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITNestedQueryPushDownTest.java
index 350e2ab..3cad6a3 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITNestedQueryPushDownTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITNestedQueryPushDownTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.indexer;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.commons.io.IOUtils;
import org.apache.druid.java.util.common.ISE;
@@ -91,7 +90,7 @@ public class ITNestedQueryPushDownTest extends AbstractIndexerTest
}
catch (Exception e) {
LOG.error(e, "Error while testing");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java
index 7dfeee1..7970a81 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.tests.indexer;
-import com.google.common.base.Throwables;
import org.apache.druid.curator.discovery.ServerDiscoverySelector;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.ISE;
@@ -83,7 +82,7 @@ public class ITRealtimeIndexTaskTest extends AbstractITRealtimeIndexTaskTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
try {
reader = new BufferedReader(isr);
@@ -131,7 +130,7 @@ public class ITRealtimeIndexTaskTest extends AbstractITRealtimeIndexTaskTest
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
reader.close();
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java
index bc8c250..7272e5e 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.tests.security;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.calcite.avatica.AvaticaSqlException;
import org.apache.druid.guice.annotations.Client;
@@ -373,7 +372,7 @@ public class ITBasicAuthConfigurationTest
return response;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/security/ITTLSTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/ITTLSTest.java
index 40aaa2c..3b841e6 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/security/ITTLSTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/security/ITTLSTest.java
@@ -530,7 +530,7 @@ public class ITTLSTest
return response;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
index 8836d15..7b1d2dc 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
@@ -19,7 +19,6 @@
package org.apache.druid.collections.bitmap;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import org.apache.druid.java.util.common.ISE;
import org.roaringbitmap.RoaringBitmap;
@@ -52,7 +51,7 @@ public class RoaringBitmapFactory implements BitmapFactory
EMPTY_IMMUTABLE_BITMAP = new ImmutableRoaringBitmap(buf);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -133,7 +132,7 @@ public class RoaringBitmapFactory implements BitmapFactory
return ((WrappedRoaringBitmap) mutableBitmap).toImmutableBitmap();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java
index 50946ca..6091921 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java
@@ -19,7 +19,6 @@
package org.apache.druid.collections.bitmap;
-import com.google.common.base.Throwables;
import org.roaringbitmap.IntIterator;
import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
@@ -63,7 +62,7 @@ public class WrappedImmutableRoaringBitmap implements ImmutableBitmap
return out.toByteArray();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java
index 8690af3..33f43e9 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java
@@ -19,7 +19,6 @@
package org.apache.druid.collections.bitmap;
-import com.google.common.base.Throwables;
import org.roaringbitmap.IntIterator;
import org.roaringbitmap.RoaringBitmap;
import org.roaringbitmap.RoaringBitmapWriter;
@@ -83,7 +82,7 @@ public class WrappedRoaringBitmap implements MutableBitmap
return out.toByteArray();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java b/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java
index 4be17f2..79d10df 100644
--- a/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java
+++ b/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java
@@ -19,7 +19,6 @@
package org.apache.druid.guice;
-import com.google.common.base.Throwables;
import com.google.inject.Binder;
import com.google.inject.Module;
import org.apache.druid.java.util.common.guava.CloseQuietly;
@@ -74,7 +73,7 @@ public class PropertiesModule implements Module
fileProps.load(new InputStreamReader(stream, StandardCharsets.UTF_8));
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
index 10f4e76..214e72a 100644
--- a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
+++ b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
@@ -27,7 +27,6 @@ import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.guava.Accumulator;
import org.apache.druid.java.util.common.guava.Sequence;
@@ -95,7 +94,7 @@ public class DruidDefaultSerializersModule extends SimpleModule
jgen.writeObject(o1);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return null;
}
diff --git a/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java b/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java
index 5281f99..f714eb2 100644
--- a/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java
@@ -20,7 +20,6 @@
package org.apache.druid.query;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
@@ -80,7 +79,7 @@ public class AsyncQueryRunner<T> implements QueryRunner<T>
}
}
catch (ExecutionException | InterruptedException | TimeoutException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
});
diff --git a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
index 0cfce57..c74c4c3 100644
--- a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
@@ -129,11 +129,12 @@ public class ChainedExecutionQueryRunner<T> implements QueryRunner<T>
return retVal;
}
catch (QueryInterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (Exception e) {
log.error(e, "Exception with one of the sequences!");
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
}
@@ -167,7 +168,8 @@ public class ChainedExecutionQueryRunner<T> implements QueryRunner<T>
throw new QueryInterruptedException(e);
}
catch (ExecutionException e) {
- throw Throwables.propagate(e.getCause());
+ Throwables.propagateIfPossible(e.getCause());
+ throw new RuntimeException(e.getCause());
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java
index dd70049..04c6f6c 100644
--- a/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java
@@ -124,11 +124,12 @@ public class GroupByMergedQueryRunner<T> implements QueryRunner<T>
return null;
}
catch (QueryInterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (Exception e) {
log.error(e, "Exception with one of the sequences!");
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
}
@@ -202,7 +203,8 @@ public class GroupByMergedQueryRunner<T> implements QueryRunner<T>
}
catch (ExecutionException e) {
closeOnFailure.close();
- throw Throwables.propagate(e.getCause());
+ Throwables.propagateIfPossible(e.getCause());
+ throw new RuntimeException(e.getCause());
}
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java b/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java
index 4c8dd60..f3320c0 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.StringUtils;
@@ -119,7 +118,7 @@ public class MapLookupExtractor extends LookupExtractor
}
catch (IOException ex) {
// If ByteArrayOutputStream.write has problems, that is a very bad thing
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunnerV2.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunnerV2.java
index d13096c..b8cc735 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunnerV2.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunnerV2.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -254,7 +253,7 @@ public class GroupByMergingQueryRunnerV2 implements QueryRunner<Row>
}
catch (Exception e) {
log.error(e, "Exception with one of the sequences!");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -386,7 +385,7 @@ public class GroupByMergingQueryRunnerV2 implements QueryRunner<Row>
throw new QueryInterruptedException(e);
}
catch (ExecutionException e) {
- throw Throwables.propagate(e.getCause());
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
index 7f142fc..4444b9e 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
@@ -22,7 +22,6 @@ package org.apache.druid.query.groupby.epinephelinae;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
@@ -419,7 +418,7 @@ public class ParallelCombiner<KeyType>
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
grouper.finish();
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
index 5dce77f..2ef2eb9 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.MappingIterator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import net.jpountz.lz4.LZ4BlockInputStream;
import net.jpountz.lz4.LZ4BlockOutputStream;
@@ -177,7 +176,7 @@ public class SpillingGrouper<KeyType> implements Grouper<KeyType>
return DISK_FULL;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
// Try again.
@@ -319,7 +318,7 @@ public class SpillingGrouper<KeyType> implements Grouper<KeyType>
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
index 8ef8a32..a774aee 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
@@ -23,7 +23,6 @@ package org.apache.druid.query.lookup;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.query.extraction.ExtractionCacheHelper;
import org.apache.druid.query.extraction.FunctionalExtraction;
@@ -116,7 +115,7 @@ public class LookupExtractionFn extends FunctionalExtraction
}
catch (IOException ex) {
// If ByteArrayOutputStream.write has problems, that is a very bad thing
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
index 91f7303..3d85572 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
@@ -20,7 +20,6 @@
package org.apache.druid.query.metadata;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
@@ -240,7 +239,7 @@ public class SegmentMetadataQueryRunnerFactory implements QueryRunnerFactory<Seg
throw new QueryInterruptedException(e);
}
catch (ExecutionException e) {
- throw Throwables.propagate(e.getCause());
+ throw new RuntimeException(e);
}
}
};
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java
index cd65797..80e21a0 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java
@@ -20,7 +20,6 @@
package org.apache.druid.segment.incremental;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.io.Closer;
@@ -275,7 +274,7 @@ public class OnheapIncrementalIndex extends IncrementalIndex<Aggregator>
closer.close();
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java
index cb02683..cba7eaf 100644
--- a/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.collections.spatial;
import com.google.common.base.Stopwatch;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.common.primitives.Bytes;
@@ -594,7 +593,7 @@ public class ImmutableRTreeTest
System.out.printf(Locale.ENGLISH, "[%,d]: union of %,d points in %,d ms%n", numPoints, finalSet.size(), stop);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -650,7 +649,7 @@ public class ImmutableRTreeTest
System.out.printf(Locale.ENGLISH, "[%,d]: union of %,d points in %,d ms%n", numPoints, finalSet.size(), stop);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java b/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java
index a85b41d..ed75911 100644
--- a/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java
+++ b/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.query;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -327,7 +326,7 @@ public class DoubleStorageTest
index.add(ROW_PARSER.parseBatch((Map<String, Object>) o).get(0));
}
catch (IndexSizeExceededException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
});
diff --git a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
index a5ea854..098f5b2 100644
--- a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.query;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.ListenableFuture;
@@ -356,7 +355,7 @@ public class PrioritizedExecutorServiceTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
if (useFifo) {
Assert.assertEquals(myOrder, hasRun.getAndIncrement());
diff --git a/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java b/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java
index ecfe3c0..6609006 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.query;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.segment.TestHelper;
import org.junit.Assert;
@@ -201,7 +200,7 @@ public class QueryInterruptedExceptionTest
return MAPPER.readValue(MAPPER.writeValueAsBytes(e), QueryInterruptedException.class);
}
catch (Exception e2) {
- throw Throwables.propagate(e2);
+ throw new RuntimeException(e2);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
index cff1b4f..3bc3ded 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
@@ -29,7 +29,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import org.apache.commons.io.IOUtils;
@@ -585,7 +584,7 @@ public class AggregationTestHelper implements Closeable
return new QueryableIndexSegment(indexIO.loadIndex(segmentDir), SegmentId.dummy(""));
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
}
@@ -624,7 +623,7 @@ public class AggregationTestHelper implements Closeable
);
}
catch (Exception ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
}
@@ -676,7 +675,7 @@ public class AggregationTestHelper implements Closeable
return Sequences.simple(resultRows);
}
catch (Exception ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
};
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java
index 56598e4..15279d7 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.query.groupby;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.Row;
import org.apache.druid.data.input.impl.CSVParseSpec;
@@ -119,8 +118,7 @@ public class GroupByQueryRunnerFactoryTest
);
}
catch (Exception e) {
- Throwables.propagate(e);
- return null;
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
index 324113a..a47ea00 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
@@ -21,7 +21,6 @@ package org.apache.druid.segment;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.druid.data.input.InputRow;
@@ -123,7 +122,7 @@ public class IndexBuilder
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -188,7 +187,7 @@ public class IndexBuilder
return merged;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -209,7 +208,7 @@ public class IndexBuilder
incrementalIndex.add(row);
}
catch (IndexSizeExceededException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return incrementalIndex;
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
index e2064e0..f8819ab 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
@@ -528,7 +527,7 @@ public class IndexMergerV9WithSpatialIndexTest
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -588,7 +587,7 @@ public class IndexMergerV9WithSpatialIndexTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -642,7 +641,7 @@ public class IndexMergerV9WithSpatialIndexTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -731,7 +730,7 @@ public class IndexMergerV9WithSpatialIndexTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java b/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java
index 62c3784..5a5ae7c 100644
--- a/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.timeline.SegmentId;
import org.joda.time.Days;
@@ -95,7 +94,7 @@ public class ReferenceCountingSegmentTest
closeable.close();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
).get();
@@ -110,7 +109,7 @@ public class ReferenceCountingSegmentTest
segment.close();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
).get();
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
index c2621f4..9229295 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.segment;
import com.fasterxml.jackson.databind.ObjectMapper;
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 org.apache.druid.data.input.MapBasedInputRow;
@@ -175,7 +174,7 @@ public class SchemalessIndexTest
theIndex.add(new MapBasedInputRow(timestamp, dims, event));
}
catch (IndexSizeExceededException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
count++;
@@ -229,7 +228,7 @@ public class SchemalessIndexTest
}
catch (IOException e) {
mergedIndex = null;
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -277,7 +276,7 @@ public class SchemalessIndexTest
return index;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -308,7 +307,7 @@ public class SchemalessIndexTest
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -348,7 +347,7 @@ public class SchemalessIndexTest
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -395,7 +394,7 @@ public class SchemalessIndexTest
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -441,7 +440,7 @@ public class SchemalessIndexTest
}
catch (IOException e) {
index = null;
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return retVal;
@@ -512,7 +511,7 @@ public class SchemalessIndexTest
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -526,7 +525,7 @@ public class SchemalessIndexTest
return indexIO.loadIndex(indexMerger.append(adapters, null, mergedFile, indexSpec, null));
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -555,7 +554,7 @@ public class SchemalessIndexTest
return indexIO.loadIndex(input);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -570,7 +569,7 @@ public class SchemalessIndexTest
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
index 87d8abf..cb5d6bd 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestIndex.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
@@ -21,7 +21,6 @@ package org.apache.druid.segment;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.io.CharSource;
import com.google.common.io.LineProcessor;
import com.google.common.io.Resources;
@@ -219,7 +218,7 @@ public class TestIndex
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
});
@@ -308,7 +307,7 @@ public class TestIndex
} else {
noRollupRealtimeIndex = null;
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -384,7 +383,7 @@ public class TestIndex
return INDEX_IO.loadIndex(someTmpFile);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java b/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java
index df81b8e..9b79ff1 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java
@@ -22,7 +22,6 @@ package org.apache.druid.segment.data;
import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import com.carrotsearch.junitbenchmarks.Clock;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -270,7 +269,7 @@ public class BenchmarkIndexibleWrites extends AbstractBenchmark
start.await();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final Random rndGen = ThreadLocalRandom.current();
while (!done.get()) {
diff --git a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
index a3c3478..407b700 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment.data;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -554,7 +553,7 @@ public class IncrementalIndexTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
currentlyRunning.incrementAndGet();
try {
@@ -564,7 +563,7 @@ public class IncrementalIndexTest
}
}
catch (IndexSizeExceededException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
currentlyRunning.decrementAndGet();
}
@@ -591,7 +590,7 @@ public class IncrementalIndexTest
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
while (concurrentlyRan.get() == 0) {
QueryRunner<Result<TimeseriesResultValue>> runner = new FinalizeResultsQueryRunner<Result<TimeseriesResultValue>>(
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
index 69857f5..e143caa 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment.filter;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import org.apache.druid.collections.spatial.search.RadiusBound;
@@ -469,7 +468,7 @@ public class SpatialFilterBonusTest
return mergedRealtime;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -521,7 +520,7 @@ public class SpatialFilterBonusTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), context));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -609,7 +608,7 @@ public class SpatialFilterBonusTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), context));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -703,7 +702,7 @@ public class SpatialFilterBonusTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), context));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
index 22e3e68..74b3070 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment.filter;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import org.apache.druid.collections.spatial.search.RadiusBound;
@@ -518,7 +517,7 @@ public class SpatialFilterTest
return mergedRealtime;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -577,7 +576,7 @@ public class SpatialFilterTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -630,7 +629,7 @@ public class SpatialFilterTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -718,7 +717,7 @@ public class SpatialFilterTest
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), new HashMap<>()));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
index 886260a..0f1944a 100644
--- a/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
+++ b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
@@ -23,7 +23,6 @@ import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import com.carrotsearch.junitbenchmarks.Clock;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.Futures;
@@ -369,7 +368,7 @@ public class OnheapIncrementalIndexBenchmark extends AbstractBenchmark
}
}
catch (IndexSizeExceededException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
currentlyRunning.decrementAndGet();
someoneRan.set(true);
diff --git a/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java b/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java
index 1b54353..48d1ace 100644
--- a/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java
+++ b/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java
@@ -22,7 +22,6 @@ package org.apache.druid.client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import org.apache.curator.framework.CuratorFramework;
import org.apache.druid.curator.inventory.CuratorInventoryManager;
import org.apache.druid.curator.inventory.CuratorInventoryManagerStrategy;
@@ -91,7 +90,7 @@ public abstract class AbstractCuratorServerInventoryView<InventoryType> implemen
return jsonMapper.readValue(bytes, DruidServer.class);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -103,7 +102,7 @@ public abstract class AbstractCuratorServerInventoryView<InventoryType> implemen
}
catch (IOException e) {
log.error(e, "Could not parse json: %s", StringUtils.fromUtf8(bytes));
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -314,7 +313,7 @@ public abstract class AbstractCuratorServerInventoryView<InventoryType> implemen
return server != null && server.getSegment(segment.getId()) != null;
}
catch (Exception ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java b/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java
index 1bc5db6..b3f3c25 100644
--- a/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java
+++ b/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java
@@ -22,7 +22,6 @@ package org.apache.druid.client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.druid.client.cache.Cache;
import org.apache.druid.client.cache.CacheConfig;
@@ -119,7 +118,7 @@ public class CachingQueryRunner<T> implements QueryRunner<T>
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
index 7f73abf..d857a9c 100644
--- a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
+++ b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -259,7 +258,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
catch (InterruptedException e) {
log.error(e, "Queue appending interrupted");
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
totalByteCount.addAndGet(response.getContent().readableBytes());
return ClientResponse.finished(
@@ -293,7 +292,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -324,7 +323,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
catch (InterruptedException e) {
log.error(e, "Unable to put finalizing input stream into Sequence queue for url [%s]", url);
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
totalByteCount.addAndGet(bytes);
}
@@ -365,7 +364,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
catch (InterruptedException e) {
log.error(e, "Unable to put finalizing input stream into Sequence queue for url [%s]", url);
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
done.set(true);
@@ -500,7 +499,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
}
}
catch (IOException | ExecutionException | InterruptedException | TimeoutException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -508,7 +507,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
Sequence<T> retVal = new BaseSequence<>(
diff --git a/server/src/main/java/org/apache/druid/client/JsonParserIterator.java b/server/src/main/java/org/apache/druid/client/JsonParserIterator.java
index d0c210b..3494c86 100644
--- a/server/src/main/java/org/apache/druid/client/JsonParserIterator.java
+++ b/server/src/main/java/org/apache/druid/client/JsonParserIterator.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.java.util.common.RE;
import org.apache.druid.java.util.common.guava.CloseQuietly;
@@ -101,7 +100,7 @@ public class JsonParserIterator<T> implements Iterator<T>, Closeable
return retVal;
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
index 9087d77..df318a0 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
@@ -24,7 +24,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -377,7 +376,7 @@ public class MemcachedCache implements Cache
}
catch (IOException e) {
log.error(e, "Unable to create memcached client");
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -391,7 +390,7 @@ public class MemcachedCache implements Cache
return new MemcachedCache(clientSupplier, config, monitor);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -471,7 +470,7 @@ public class MemcachedCache implements Cache
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (ExecutionException e) {
errorCount.incrementAndGet();
@@ -581,7 +580,7 @@ public class MemcachedCache implements Cache
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
catch (ExecutionException e) {
errorCount.incrementAndGet();
diff --git a/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java b/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java
index 702d78b..9baa2d1 100644
--- a/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java
+++ b/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java
@@ -22,7 +22,6 @@ package org.apache.druid.client.indexing;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.discovery.DruidLeaderClient;
import org.apache.druid.indexer.TaskStatusPlus;
@@ -143,7 +142,7 @@ public class HttpIndexingServiceClient implements IndexingServiceClient
return Preconditions.checkNotNull(taskId, "Null task id for task[%s]", taskObject);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -180,7 +179,7 @@ public class HttpIndexingServiceClient implements IndexingServiceClient
return killedTaskId;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
index c3cb7da..80e29c1 100644
--- a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
+++ b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
@@ -20,7 +20,6 @@
package org.apache.druid.curator.announcement;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.transaction.CuratorTransaction;
import org.apache.curator.framework.api.transaction.CuratorTransactionFinal;
@@ -326,7 +325,7 @@ public class Announcer
createAnnouncement(path, bytes);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -362,7 +361,7 @@ public class Announcer
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -405,7 +404,7 @@ public class Announcer
log.info("node[%s] didn't exist anyway...", path);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -416,7 +415,7 @@ public class Announcer
}
catch (Exception e) {
CloseQuietly.close(cache);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
index 517c1e8..10b2a6c 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
@@ -20,7 +20,6 @@
package org.apache.druid.curator.discovery;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.leader.LeaderLatch;
import org.apache.curator.framework.recipes.leader.LeaderLatchListener;
@@ -156,7 +155,7 @@ public class CuratorDruidLeaderSelector implements DruidLeaderSelector
return null;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -190,7 +189,7 @@ public class CuratorDruidLeaderSelector implements DruidLeaderSelector
lifecycleLock.started();
}
catch (Exception ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
finally {
lifecycleLock.exitStart();
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java
index eaa5a36..ab27916 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java
@@ -21,7 +21,6 @@ package org.apache.druid.curator.discovery;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.curator.utils.ZKPaths;
import org.apache.druid.curator.announcement.Announcer;
@@ -65,7 +64,7 @@ public class CuratorDruidNodeAnnouncer implements DruidNodeAnnouncer
log.info("Announced [%s].", discoveryDruidNode);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java
index 86fe0c3..fbe5e61 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java
@@ -21,7 +21,6 @@ package org.apache.druid.curator.discovery;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
import org.apache.curator.framework.CuratorFramework;
@@ -398,7 +397,7 @@ public class CuratorDruidNodeDiscoveryProvider extends DruidNodeDiscoveryProvide
cache.start(PathChildrenCache.StartMode.POST_INITIALIZED_EVENT);
}
catch (Exception ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java
index aa37395..26afee8 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java
@@ -19,7 +19,6 @@
package org.apache.druid.curator.discovery;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceInstance;
@@ -71,7 +70,7 @@ public class CuratorServiceAnnouncer implements ServiceAnnouncer
.build();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
instanceMap.put(serviceName, instance);
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
index d38601c..5dd53da 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
@@ -19,7 +19,6 @@
package org.apache.druid.curator.discovery;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
import com.google.inject.Inject;
@@ -291,7 +290,7 @@ public class DiscoveryModule implements Module
serviceDiscovery.close();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java b/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java
index 9f9e954..feab7e0 100644
--- a/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java
+++ b/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java
@@ -21,7 +21,6 @@ package org.apache.druid.guice;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.druid.segment.realtime.FireDepartment;
@@ -47,7 +46,7 @@ public class FireDepartmentsProvider implements Provider<List<FireDepartment>>
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java b/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java
index 00cda16..22cbfcd 100644
--- a/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java
+++ b/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java
@@ -19,7 +19,6 @@
package org.apache.druid.guice.http;
-import com.google.common.base.Throwables;
import com.google.inject.Binder;
import com.google.inject.Module;
import org.apache.druid.guice.JsonConfigProvider;
@@ -145,14 +144,14 @@ public class JettyHttpClientModule implements Module
httpClient.stop();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return httpClient;
diff --git a/server/src/main/java/org/apache/druid/initialization/Initialization.java b/server/src/main/java/org/apache/druid/initialization/Initialization.java
index bee01d1..5082e43 100644
--- a/server/src/main/java/org/apache/druid/initialization/Initialization.java
+++ b/server/src/main/java/org/apache/druid/initialization/Initialization.java
@@ -21,7 +21,6 @@ package org.apache.druid.initialization;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -184,7 +183,7 @@ public class Initialization
ServiceLoader.load(serviceClass, loader).forEach(impl -> tryAdd(impl, "local file system"));
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -359,7 +358,7 @@ public class Initialization
return urls;
}
catch (IOException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index b0aaa97..3cdbd0d 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -22,7 +22,6 @@ package org.apache.druid.metadata;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -813,7 +812,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor
return jsonMapper.readValue(bytes, DataSourceMetadata.class);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -1102,7 +1101,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor
return accumulator;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
index f724375..2104c16 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
@@ -133,7 +133,8 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
return RetryUtils.retry(() -> getDBI().withHandle(callback), myShouldRetry, DEFAULT_MAX_TRIES);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
@@ -148,7 +149,8 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
return RetryUtils.retry(() -> getDBI().inTransaction(TransactionIsolationLevel.READ_COMMITTED, callback), shouldRetry, quietTries, maxTries);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java
index ed308c5..be95669 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import org.apache.druid.audit.AuditEntry;
@@ -125,7 +124,7 @@ public class SQLMetadataRuleManager implements MetadataRuleManager
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -278,7 +277,7 @@ public class SQLMetadataRuleManager implements MetadataRuleManager
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -301,7 +300,7 @@ public class SQLMetadataRuleManager implements MetadataRuleManager
return retVal;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java
index 318f6d7..ba3d05c 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java
@@ -20,7 +20,6 @@
package org.apache.druid.metadata;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.audit.AuditManager;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
@@ -86,7 +85,7 @@ public class SQLMetadataRuleManagerProvider implements MetadataRuleManagerProvid
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new SQLMetadataRuleManager(jsonMapper, config, dbTables, connector, auditManager);
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
index ecc56d8..ec73dc5 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
@@ -21,7 +21,6 @@ package org.apache.druid.metadata;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -613,7 +612,7 @@ public class SQLMetadataSegmentManager implements MetadataSegmentManager
result.add(iter.next());
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return result;
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
index da8bd61..1ef900a 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
+import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import org.apache.druid.indexer.TaskInfo;
import org.apache.druid.java.util.common.DateTimes;
@@ -163,6 +164,7 @@ public abstract class SQLMetadataStorageActionHandler<EntryType, StatusType, Log
if (isStatementException(e) && getEntry(id).isPresent()) {
throw new EntryExistsException(id, e);
} else {
+ Throwables.propagateIfPossible(e);
throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java
index 075a6ab..871cb5d 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java
@@ -22,7 +22,6 @@ package org.apache.druid.metadata;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import org.apache.druid.guice.ManageLifecycle;
@@ -138,7 +137,7 @@ public class SQLMetadataSupervisorManager implements MetadataSupervisorManager
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -164,7 +163,7 @@ public class SQLMetadataSupervisorManager implements MetadataSupervisorManager
return retVal;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -211,7 +210,7 @@ public class SQLMetadataSupervisorManager implements MetadataSupervisorManager
);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -232,7 +231,7 @@ public class SQLMetadataSupervisorManager implements MetadataSupervisorManager
return retVal;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java
index 3cb0639..725c531 100644
--- a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java
+++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java
@@ -19,7 +19,6 @@
package org.apache.druid.metadata.storage.derby;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.derby.drda.NetworkServerControl;
import org.apache.druid.java.util.common.logger.Logger;
@@ -41,7 +40,7 @@ public class DerbyMetadataStorage extends MetadataStorage
this.server = new NetworkServerControl(InetAddress.getByName(config.getHost()), config.getPort());
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -54,7 +53,7 @@ public class DerbyMetadataStorage extends MetadataStorage
server.start(null);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -65,7 +64,7 @@ public class DerbyMetadataStorage extends MetadataStorage
server.shutdown();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java b/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java
index 9cb47e9..1a260b1 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java
@@ -19,7 +19,6 @@
package org.apache.druid.segment.loading;
-import com.google.common.base.Throwables;
import org.apache.druid.data.SearchableVersionedDataFinder;
import org.apache.druid.java.util.common.RetryUtils;
@@ -88,7 +87,7 @@ public class LocalFileTimestampVersionFinder extends LocalDataSegmentPuller
if (e instanceof FileNotFoundException) {
return null;
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java
index 4b64376..feaaeb0 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java
@@ -24,7 +24,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import org.apache.druid.data.input.Committer;
@@ -245,7 +244,7 @@ public class RealtimeManager implements QuerySegmentWalker
return fireDepartment.connect();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -319,7 +318,7 @@ public class RealtimeManager implements QuerySegmentWalker
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
index 3510134..647340b 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
@@ -26,7 +26,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -763,7 +762,7 @@ public class AppenderatorImpl implements Appenderator
catch (Exception e) {
metrics.incrementFailedHandoffs();
log.warn(e, "Failed to push merged index for segment[%s].", identifier);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -883,7 +882,7 @@ public class AppenderatorImpl implements Appenderator
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -898,7 +897,7 @@ public class AppenderatorImpl implements Appenderator
}
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -1139,7 +1138,7 @@ public class AppenderatorImpl implements Appenderator
log.makeAlert(e, "Failed to update committed segments[%s]", schema.getDataSource())
.addData("identifier", identifier.toString())
.emit();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
commitLock.unlock();
@@ -1281,7 +1280,7 @@ public class AppenderatorImpl implements Appenderator
.addData("count", indexToPersist.getCount())
.emit();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java
index 8eb27db..57920a5 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java
@@ -23,7 +23,6 @@ import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -223,7 +222,7 @@ public class AppenderatorPlumber implements Plumber
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
stopped = true;
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java
index 76100e1..f8b12ad 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java
@@ -598,7 +598,8 @@ public abstract class BaseAppenderatorDriver implements Closeable
catch (Exception e) {
// Must not remove segments here, we aren't sure if our transaction succeeded or not.
log.warn(e, "Failed publish, not removing segments: %s", segmentsAndMetadata.getSegments());
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java
index 6e059e2..1602d57 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java
@@ -22,7 +22,6 @@ package org.apache.druid.segment.realtime.firehose;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.FirehoseFactory;
import org.apache.druid.data.input.InputRow;
@@ -97,10 +96,10 @@ public class CombiningFirehoseFactory implements FirehoseFactory<InputRowParser>
}
catch (IOException e2) {
log.error(e, "Unable to close currentFirehose!");
- throw Throwables.propagate(e2);
+ throw new RuntimeException(e2);
}
}
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
index fe7a5a2..8e0ad2b 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.Ints;
@@ -541,7 +540,7 @@ public class RealtimePlumber implements Plumber
}
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -978,7 +977,7 @@ public class RealtimePlumber implements Plumber
.addData("count", indexToPersist.getCount())
.emit();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java b/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java
index e7cadfc..8b198d1 100644
--- a/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java
+++ b/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -311,7 +310,7 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet implements Qu
proxyRequest.getHeaders().put(HttpHeader.CONTENT_LENGTH, String.valueOf(bytes.length));
}
catch (JsonProcessingException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/server/QueryResource.java b/server/src/main/java/org/apache/druid/server/QueryResource.java
index fba6672..ec772c5 100644
--- a/server/src/main/java/org/apache/druid/server/QueryResource.java
+++ b/server/src/main/java/org/apache/druid/server/QueryResource.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.io.CountingOutputStream;
@@ -227,7 +226,7 @@ public class QueryResource implements QueryCountStatsProvider
catch (Exception ex) {
e = ex;
log.error(ex, "Unable to send query response.");
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
finally {
Thread.currentThread().setName(currThreadName);
@@ -269,7 +268,7 @@ public class QueryResource implements QueryCountStatsProvider
catch (Exception e) {
// make sure to close yielder if anything happened before starting to serialize the response.
yielder.close();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
// do not close yielder here, since we do not want to close the yielder prior to
diff --git a/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java
index fdb9900..c1d8739 100644
--- a/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java
+++ b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java
@@ -21,7 +21,6 @@ package org.apache.druid.server.audit;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.druid.audit.AuditManager;
import org.apache.druid.guice.annotations.Json;
@@ -79,7 +78,7 @@ public class SQLAuditManagerProvider implements AuditManagerProvider
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new SQLAuditManager(connector, dbTables, emitter, mapper, config);
diff --git a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
index 205bbac..fd53a1c 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
@@ -22,7 +22,6 @@ package org.apache.druid.server.coordination;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
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.util.concurrent.ListenableFuture;
@@ -369,7 +368,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -383,7 +382,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
}
catch (Exception e) {
zkSegments.remove(segment);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
count++;
@@ -399,7 +398,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
}
catch (Exception e) {
zkSegments.removeAll(segments);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
count += segments.size();
@@ -415,7 +414,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
}
catch (Exception e) {
zkSegments.add(segment);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
count--;
diff --git a/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java
index 5954100..1f456bd 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java
@@ -21,7 +21,6 @@ package org.apache.druid.server.coordination;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.inject.Inject;
import org.apache.curator.utils.ZKPaths;
import org.apache.druid.curator.announcement.Announcer;
@@ -73,7 +72,7 @@ public class CuratorDataSegmentServerAnnouncer implements DataSegmentServerAnnou
announcer.announce(path, jsonMapper.writeValueAsBytes(server), false);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
announced = true;
diff --git a/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java b/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java
index 36fbe56..c2a58ba 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java
@@ -156,7 +156,7 @@ public class SegmentLoadDropHandler implements DataSegmentChangeHandler
}
catch (Exception e) {
Throwables.propagateIfPossible(e, IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
started = true;
log.info("Started.");
@@ -176,7 +176,7 @@ public class SegmentLoadDropHandler implements DataSegmentChangeHandler
serverAnnouncer.unannounce();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
started = false;
diff --git a/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java b/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java
index d55c8d8..fcf86b3 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java
@@ -139,7 +139,7 @@ public class ZkCoordinator
log.error(e1, "Failed to delete zNode[%s], but ignoring exception.", path);
}
log.error(e, "Exception while removing zNode[%s]", path);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -173,7 +173,7 @@ public class ZkCoordinator
}
catch (Exception e) {
Throwables.propagateIfPossible(e, IOException.class);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
started = true;
@@ -193,7 +193,7 @@ public class ZkCoordinator
loadQueueCache.close();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
loadQueueCache = null;
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
index c20ae0c..98c97a0 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.coordinator;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
@@ -411,14 +410,14 @@ public class DruidCoordinator
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
);
}
catch (Exception e) {
dropPeon.unmarkSegmentToDrop(segmentToLoad);
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
catch (Exception e) {
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java
index 0c0ee56..703f52e 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java
@@ -22,7 +22,6 @@ package org.apache.druid.server.coordinator;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
@@ -136,7 +135,7 @@ public class HttpLoadQueuePeon extends LoadQueuePeon
);
}
catch (MalformedURLException ex) {
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
}
diff --git a/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java
index 3e6042d..987ccb9 100644
--- a/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java
+++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.http;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import org.apache.druid.java.util.common.StringUtils;
@@ -69,7 +68,7 @@ public class CoordinatorRedirectInfo implements RedirectInfo
return new URL(location);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java b/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java
index b083f97..04d51df 100644
--- a/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.listener.announcer;
-import com.google.common.base.Throwables;
import org.apache.curator.utils.ZKPaths;
import org.apache.druid.curator.announcement.Announcer;
import org.apache.druid.java.util.common.lifecycle.LifecycleStart;
@@ -83,7 +82,7 @@ public abstract class ListenerResourceAnnouncer
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
announcer.announce(announcePath, ANNOUNCE_BYTES);
LOG.info("Announcing start time on [%s]", announcePath);
diff --git a/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java
index c40575f..cddcc78 100644
--- a/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java
+++ b/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java
@@ -111,7 +111,7 @@ public class ComposingRequestLoggerProvider implements RequestLoggerProvider
}
if (exception != null) {
Throwables.propagateIfInstanceOf(exception, IOException.class);
- throw Throwables.propagate(exception);
+ throw new RuntimeException(exception);
}
}
diff --git a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
index d225152..0cab5d3 100644
--- a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
+++ b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
@@ -20,7 +20,6 @@
package org.apache.druid.server.log;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.concurrent.ScheduledExecutors;
import org.apache.druid.java.util.common.guava.CloseQuietly;
@@ -99,7 +98,7 @@ public class FileRequestLogger implements RequestLogger
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return ScheduledExecutors.Signal.REPEAT;
@@ -108,7 +107,7 @@ public class FileRequestLogger implements RequestLogger
);
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/main/java/org/apache/druid/server/security/TLSUtils.java b/server/src/main/java/org/apache/druid/server/security/TLSUtils.java
index 83d1e50..4ff34af 100644
--- a/server/src/main/java/org/apache/druid/server/security/TLSUtils.java
+++ b/server/src/main/java/org/apache/druid/server/security/TLSUtils.java
@@ -20,7 +20,6 @@
package org.apache.druid.server.security;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.metadata.PasswordProvider;
import org.eclipse.jetty.util.ssl.AliasedX509ExtendedKeyManager;
@@ -178,7 +177,7 @@ public class TLSUtils
TLSCertificateChecker tlsCertificateChecker
)
{
- SSLContext sslContext = null;
+ SSLContext sslContext;
try {
sslContext = SSLContext.getInstance(protocol == null ? "TLSv1.2" : protocol);
KeyStore trustStore = KeyStore.getInstance(trustStoreType == null
@@ -239,7 +238,7 @@ public class TLSUtils
);
}
catch (CertificateException | KeyManagementException | IOException | KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return sslContext;
}
diff --git a/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java b/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java
index 301907d..0d85423 100644
--- a/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java
+++ b/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.hash.HashFunction;
@@ -78,7 +77,7 @@ public class HashBasedNumberedShardSpec extends NumberedShardSpec
return hash(jsonMapper, groupKey);
}
catch (JsonProcessingException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
index e1b7a88..f81d64f 100644
--- a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
+++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
@@ -26,7 +26,6 @@ import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -428,7 +427,7 @@ public class CachingClusteredClientTest
).get();
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
};
diff --git a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
index d07322c..1586b60 100644
--- a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
+++ b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Stopwatch;
-import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Futures;
@@ -487,7 +486,7 @@ public class BatchServerInventoryViewTest
testSegments.addAll(segments);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return segmentAnnouncer;
}
diff --git a/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java b/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java
index 7a07851..5eb813e 100644
--- a/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java
+++ b/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java
@@ -20,7 +20,6 @@
package org.apache.druid.curator;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -91,11 +90,11 @@ public class CuratorTestBase
.forPath(ZKPaths.makePath(inventoryPath, server.getHost()));
}
catch (Exception e1) {
- Throwables.propagate(e1);
+ throw new RuntimeException(e1);
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -121,11 +120,11 @@ public class CuratorTestBase
.forPath(segmentAnnouncementPath, jsonMapper.writeValueAsBytes(ImmutableSet.of(segment)));
}
catch (Exception e1) {
- Throwables.propagate(e1);
+ throw new RuntimeException(e1);
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -160,11 +159,11 @@ public class CuratorTestBase
.forPath(segmentAnnouncementPath, jsonMapper.writeValueAsBytes(segments));
}
catch (Exception e1) {
- Throwables.propagate(e1);
+ throw new RuntimeException(e1);
}
}
catch (Exception e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return segmentAnnouncementPath;
diff --git a/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java b/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java
index cd38177..4c8b3a3 100644
--- a/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java
+++ b/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.segment.indexing.granularity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
@@ -191,7 +190,7 @@ public class ArbitraryGranularityTest
Assert.assertEquals("Round-trip", spec.bucketIntervals(), rtSpec.bucketIntervals());
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java b/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java
index ac74318..1bf6d15 100644
--- a/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java
+++ b/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java
@@ -21,7 +21,6 @@ package org.apache.druid.segment.indexing.granularity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
@@ -144,7 +143,7 @@ public class UniformGranularityTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java b/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java
index 4e69322..7df4c14 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -950,7 +949,7 @@ public class RealtimeManagerTest
Thread.sleep(1000);
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return true;
}
diff --git a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
index a8bd301..07cbba4 100644
--- a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.server;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
@@ -452,7 +451,7 @@ public class QueryResourceTest
// When the query is cancelled the control will reach here,
// countdown the latch and rethrow the exception so that error response is returned for the query
cancelledCountDownLatch.countDown();
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new Access(true);
} else {
@@ -505,7 +504,7 @@ public class QueryResourceTest
Assert.assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatus());
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
waitFinishLatch.countDown();
}
@@ -573,7 +572,7 @@ public class QueryResourceTest
waitForCancellationLatch.await();
}
catch (InterruptedException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new Access(true);
} else {
@@ -627,7 +626,7 @@ public class QueryResourceTest
Assert.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
waitFinishLatch.countDown();
}
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
index e139921..14ec19c 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.server.coordination;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.client.cache.CacheConfig;
@@ -417,7 +416,7 @@ public class ServerManagerTest
factory.clearAdapters();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -724,7 +723,7 @@ public class ServerManagerTest
waitYieldLatch.await(1000, TimeUnit.MILLISECONDS);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
final Yielder<OutType> baseYielder = baseSequence.toYielder(initValue, accumulator);
@@ -737,7 +736,7 @@ public class ServerManagerTest
waitLatch.await(1000, TimeUnit.MILLISECONDS);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return baseYielder.get();
}
diff --git a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
index 8debba1..f1a65e7 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
@@ -22,7 +22,6 @@ package org.apache.druid.server.coordination.coordination;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -471,7 +470,7 @@ public class BatchDataSegmentAnnouncerTest
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new HashSet<>();
diff --git a/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java
index c97c83d..defe2de 100644
--- a/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java
+++ b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.initialization;
-import com.google.common.base.Throwables;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.servlet.GuiceFilter;
@@ -123,7 +122,7 @@ public abstract class BaseJettyTest
);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java
index fca71f5..f7b0f95 100644
--- a/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java
+++ b/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java
@@ -20,7 +20,6 @@
package org.apache.druid.server.initialization;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
@@ -143,7 +142,7 @@ public class JettyQosTest extends BaseJettyTest
}
catch (Exception e) {
e.printStackTrace();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
@@ -179,7 +178,7 @@ public class JettyQosTest extends BaseJettyTest
}
catch (Exception e) {
e.printStackTrace();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
index a800963..4f5ea1f 100644
--- a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
+++ b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.server.initialization;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.Binder;
@@ -273,7 +272,7 @@ public class JettyTest extends BaseJettyTest
// Expected.
}
catch (Throwable t) {
- Throwables.propagate(t);
+ throw new RuntimeException(t);
}
latch.countDown();
}
diff --git a/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java
index 7a0d9bb..6d3b699 100644
--- a/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java
+++ b/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java
@@ -21,7 +21,6 @@ package org.apache.druid.cli;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Injector;
import com.google.inject.Module;
@@ -126,7 +125,7 @@ public class CliInternalHadoopIndexer extends GuiceRunnable
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -161,7 +160,7 @@ public class CliInternalHadoopIndexer extends GuiceRunnable
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return config;
diff --git a/services/src/main/java/org/apache/druid/cli/CliPeon.java b/services/src/main/java/org/apache/druid/cli/CliPeon.java
index e4334f4..ba64d72 100644
--- a/services/src/main/java/org/apache/druid/cli/CliPeon.java
+++ b/services/src/main/java/org/apache/druid/cli/CliPeon.java
@@ -296,7 +296,7 @@ public class CliPeon extends GuiceRunnable
return mapper.readValue(config.getTaskFile(), Task.class);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -380,7 +380,7 @@ public class CliPeon extends GuiceRunnable
System.out.println("Finished peon task");
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/services/src/main/java/org/apache/druid/cli/DumpSegment.java b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
index 753b648..2be5719 100644
--- a/services/src/main/java/org/apache/druid/cli/DumpSegment.java
+++ b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
@@ -22,7 +22,6 @@ package org.apache.druid.cli;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
@@ -195,7 +194,7 @@ public class DumpSegment extends GuiceRunnable
}
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -232,7 +231,7 @@ public class DumpSegment extends GuiceRunnable
objectMapper.writeValue(out, analysis);
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return null;
}
@@ -300,7 +299,7 @@ public class DumpSegment extends GuiceRunnable
out.write('\n');
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
cursor.advance();
@@ -389,7 +388,7 @@ public class DumpSegment extends GuiceRunnable
jg.writeEndObject();
}
catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return null;
diff --git a/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java b/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java
index 090f6a3..8407351 100644
--- a/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java
+++ b/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java
@@ -19,7 +19,6 @@
package org.apache.druid.cli;
-import com.google.common.base.Throwables;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
@@ -69,7 +68,7 @@ public abstract class GuiceRunnable implements Runnable
return Initialization.makeInjectorWithModules(baseInjector, getModules());
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -114,7 +113,7 @@ public abstract class GuiceRunnable implements Runnable
return lifecycle;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/services/src/main/java/org/apache/druid/cli/PullDependencies.java b/services/src/main/java/org/apache/druid/cli/PullDependencies.java
index 885e100..ebee879 100644
--- a/services/src/main/java/org/apache/druid/cli/PullDependencies.java
+++ b/services/src/main/java/org/apache/druid/cli/PullDependencies.java
@@ -20,7 +20,6 @@
package org.apache.druid.cli;
import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
import io.airlift.airline.Command;
@@ -279,7 +278,7 @@ public class PullDependencies implements Runnable
}
catch (IOException e) {
log.error(e, "Unable to clear or create extension directory at [%s]", extensionsDir);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
log.info(
@@ -321,7 +320,7 @@ public class PullDependencies implements Runnable
log.info("Finish downloading dependencies for hadoop extension coordinates: [%s]", hadoopCoordinates);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -411,7 +410,7 @@ public class PullDependencies implements Runnable
}
catch (Exception e) {
log.error(e, "Unable to resolve artifacts for [%s].", dependencyRequest);
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
log.info("Finish downloading extension [%s]", versionedArtifact);
}
@@ -459,7 +458,7 @@ public class PullDependencies implements Runnable
remoteRepositories.add(r);
}
catch (URISyntaxException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/services/src/main/java/org/apache/druid/cli/ServerRunnable.java b/services/src/main/java/org/apache/druid/cli/ServerRunnable.java
index 8429a05..9aa0e2b 100644
--- a/services/src/main/java/org/apache/druid/cli/ServerRunnable.java
+++ b/services/src/main/java/org/apache/druid/cli/ServerRunnable.java
@@ -19,7 +19,6 @@
package org.apache.druid.cli;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Binder;
@@ -61,7 +60,7 @@ public abstract class ServerRunnable extends GuiceRunnable
lifecycle.join();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/services/src/main/java/org/apache/druid/cli/ValidateSegments.java b/services/src/main/java/org/apache/druid/cli/ValidateSegments.java
index d6f92c5..1487d2a 100644
--- a/services/src/main/java/org/apache/druid/cli/ValidateSegments.java
+++ b/services/src/main/java/org/apache/druid/cli/ValidateSegments.java
@@ -19,7 +19,6 @@
package org.apache.druid.cli;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
import com.google.inject.Injector;
@@ -72,7 +71,7 @@ public class ValidateSegments extends GuiceRunnable
log.info("Segments [%s] and [%s] are identical", dir1, dir2);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
index c2264a2..51eb8df 100644
--- a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
+++ b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
@@ -202,7 +202,8 @@ public class DruidJsonValidator extends GuiceRunnable
}
catch (Exception e) {
LOG.error(e, "INVALID JSON!");
- throw Throwables.propagate(e);
+ Throwables.propagateIfPossible(e);
+ throw new RuntimeException(e);
}
}
diff --git a/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java b/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java
index 7e53839..3a7466b 100644
--- a/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java
+++ b/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.cli;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import io.tesla.aether.internal.DefaultTeslaAether;
import org.apache.druid.guice.ExtensionsConfig;
@@ -122,7 +121,7 @@ public class PullDependenciesTest
jarFile.createNewFile();
}
catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
artifacts.add(new DefaultArtifact(null, jarName, null, "jar", "1.0", null, jarFile));
}
diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java
index 814dcdd..030755b 100644
--- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java
+++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java
@@ -22,7 +22,6 @@ package org.apache.druid.sql.avatica;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -621,7 +620,7 @@ public class DruidMeta extends MetaImpl
return metaResultSet;
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
finally {
closeStatement(statement);
diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java
index 20cdd45..8cfd9e6 100644
--- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java
+++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java
@@ -20,7 +20,6 @@
package org.apache.druid.sql.avatica;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import org.apache.calcite.avatica.ColumnMetaData;
import org.apache.calcite.avatica.Meta;
@@ -173,7 +172,7 @@ public class DruidStatement implements Closeable
catch (Throwable t1) {
t.addSuppressed(t1);
}
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
return this;
@@ -207,7 +206,7 @@ public class DruidStatement implements Closeable
catch (Throwable t1) {
t.addSuppressed(t1);
}
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
return this;
@@ -334,7 +333,7 @@ public class DruidStatement implements Closeable
}
}
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
if (oldState != State.DONE) {
@@ -346,7 +345,7 @@ public class DruidStatement implements Closeable
onClose.run();
}
catch (Throwable t) {
- throw Throwables.propagate(t);
+ throw new RuntimeException(t);
}
}
}
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java
index 7be32d2..f358168 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java
@@ -19,7 +19,6 @@
package org.apache.druid.sql.calcite.rel;
-import com.google.common.base.Throwables;
import org.apache.calcite.DataContext;
import org.apache.calcite.interpreter.BindableRel;
import org.apache.calcite.interpreter.Node;
@@ -140,7 +139,7 @@ public abstract class DruidRel<T extends DruidRel> extends AbstractRelNode imple
theSink.send(Row.of(in));
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return theSink;
}
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java b/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java
index ed1f260..0c40db5 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java
@@ -19,7 +19,6 @@
package org.apache.druid.sql.calcite.view;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeImpl;
@@ -60,7 +59,7 @@ public class DruidViewMacro implements TableMacro
rowType = planner.plan(viewSql).rowType();
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
return new ViewTable(
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
index 484022d..39c5172 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
@@ -21,7 +21,6 @@ package org.apache.druid.sql.http;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.io.CountingOutputStream;
import com.google.inject.Inject;
import org.apache.calcite.plan.RelOptPlanner;
@@ -153,7 +152,7 @@ public class SqlResource
catch (Exception ex) {
e = ex;
log.error(ex, "Unable to send sql response [%s]", sqlQueryId);
- throw Throwables.propagate(ex);
+ throw new RuntimeException(ex);
}
finally {
yielder.close();
@@ -167,7 +166,7 @@ public class SqlResource
catch (Throwable e) {
// make sure to close yielder if anything happened before starting to serialize the response.
yielder0.close();
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
catch (ForbiddenException e) {
diff --git a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
index 425632d..75630bc 100644
--- a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.druid.sql.avatica;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -631,7 +630,7 @@ public class DruidAvaticaHandlerTest extends CalciteTestBase
return ((Number) Iterables.getOnlyElement(rows).get("ci")).intValue();
}
catch (SQLException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
})
);
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
index 9ca3233..ace64ad 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
@@ -22,7 +22,6 @@ package org.apache.druid.sql.calcite.util;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -675,7 +674,7 @@ public class CalciteTests
return new DruidOperatorTable(ImmutableSet.of(), extractionOperators);
}
catch (Exception e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -708,7 +707,7 @@ public class CalciteTests
schema.awaitInitialization();
}
catch (InterruptedException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
schema.stop();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org