Repository: asterixdb Updated Branches: refs/heads/master ae0b3fe88 -> 17cd99cc7
[NO ISSUE] Exceptions cleanup Change-Id: I8f89ee4cafddb87639cb74138d6a06ace81f4cda Reviewed-on: https://asterix-gerrit.ics.uci.edu/2023 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/17cd99cc Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/17cd99cc Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/17cd99cc Branch: refs/heads/master Commit: 17cd99cc7ecb50f9494a7b7ae48bfd205d05b2e9 Parents: ae0b3fe Author: Till Westmann <[email protected]> Authored: Fri Sep 22 12:31:36 2017 -0700 Committer: Till Westmann <[email protected]> Committed: Sat Sep 23 23:00:29 2017 -0700 ---------------------------------------------------------------------- .../app/active/ActiveEntityEventsListener.java | 11 +++++------ .../apache/asterix/app/active/FeedEventsListener.java | 14 +++++--------- .../asterix/test/active/DummyFeedEventsListener.java | 4 ++-- .../asterix/test/active/TestEventsListener.java | 8 ++++---- 4 files changed, 16 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/17cd99cc/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java index c1e772c..77f2b23 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java @@ -53,7 +53,6 @@ import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.translator.IStatementExecutor; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; -import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; @@ -381,18 +380,18 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl } } - protected abstract void doStart(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException; + protected abstract void doStart(MetadataProvider metadataProvider) throws HyracksDataException; - protected abstract Void doStop(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException; + protected abstract Void doStop(MetadataProvider metadataProvider) throws HyracksDataException; protected abstract Void doSuspend(MetadataProvider metadataProvider) - throws HyracksDataException, AlgebricksException; + throws HyracksDataException; protected abstract void doResume(MetadataProvider metadataProvider) - throws HyracksDataException, AlgebricksException; + throws HyracksDataException; protected abstract void setRunning(MetadataProvider metadataProvider, boolean running) - throws HyracksDataException, AlgebricksException; + throws HyracksDataException; @Override public synchronized void stop(MetadataProvider metadataProvider) throws HyracksDataException, InterruptedException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/17cd99cc/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/FeedEventsListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/FeedEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/FeedEventsListener.java index c01bcbc..38e8a21 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/FeedEventsListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/FeedEventsListener.java @@ -80,7 +80,7 @@ public class FeedEventsListener extends ActiveEntityEventsListener { } @Override - protected void doStart(MetadataProvider mdProvider) throws HyracksDataException, AlgebricksException { + protected void doStart(MetadataProvider mdProvider) throws HyracksDataException { try { ILangCompilationProvider compilationProvider = new AqlCompilationProvider(); IStorageComponentProvider storageComponentProvider = new StorageComponentProvider(); @@ -106,15 +106,13 @@ public class FeedEventsListener extends ActiveEntityEventsListener { EnumSet.of(ActivityState.STOPPED, ActivityState.PERMANENTLY_FAILED)); stoppedSubscriber.sync(); } - } catch (AlgebricksException e) { - throw e; } catch (Exception e) { throw HyracksDataException.create(e); } } @Override - protected Void doStop(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected Void doStop(MetadataProvider metadataProvider) throws HyracksDataException { IActiveEntityEventSubscriber eventSubscriber = new WaitForStateSubscriber(this, EnumSet.of(ActivityState.STOPPED, ActivityState.PERMANENTLY_FAILED)); try { @@ -125,8 +123,6 @@ public class FeedEventsListener extends ActiveEntityEventsListener { i); } eventSubscriber.sync(); - } catch (AlgebricksException e) { - throw e; } catch (Exception e) { throw HyracksDataException.create(e); } @@ -135,17 +131,17 @@ public class FeedEventsListener extends ActiveEntityEventsListener { @Override protected void setRunning(MetadataProvider metadataProvider, boolean running) - throws HyracksDataException, AlgebricksException { + throws HyracksDataException { // No op } @Override - protected Void doSuspend(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected Void doSuspend(MetadataProvider metadataProvider) throws HyracksDataException { throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED); } @Override - protected void doResume(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected void doResume(MetadataProvider metadataProvider) throws HyracksDataException { throw new RuntimeDataException(ErrorCode.OPERATION_NOT_SUPPORTED); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/17cd99cc/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/DummyFeedEventsListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/DummyFeedEventsListener.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/DummyFeedEventsListener.java index 4de5813..c269803 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/DummyFeedEventsListener.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/DummyFeedEventsListener.java @@ -50,7 +50,7 @@ public class DummyFeedEventsListener extends FeedEventsListener { } @Override - protected void doStart(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected void doStart(MetadataProvider metadataProvider) throws HyracksDataException { WaitForStateSubscriber eventSubscriber = new WaitForStateSubscriber(this, Collections.singleton(ActivityState.RUNNING)); try { @@ -64,7 +64,7 @@ public class DummyFeedEventsListener extends FeedEventsListener { } @Override - protected Void doStop(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected Void doStop(MetadataProvider metadataProvider) throws HyracksDataException { IActiveEntityEventSubscriber eventSubscriber = new WaitForStateSubscriber(this, EnumSet.of(ActivityState.RUNNING, ActivityState.PERMANENTLY_FAILED)); try { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/17cd99cc/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java index c8d4b53..90880aa 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java @@ -105,7 +105,7 @@ public class TestEventsListener extends ActiveEntityEventsListener { @SuppressWarnings("deprecation") @Override - protected void doStart(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected void doStart(MetadataProvider metadataProvider) throws HyracksDataException { step(onStart); failCompile(onStart); JobId jobId = jobIdFactory.create(); @@ -178,7 +178,7 @@ public class TestEventsListener extends ActiveEntityEventsListener { @Override protected void setRunning(MetadataProvider metadataProvider, boolean running) - throws HyracksDataException, AlgebricksException { + throws HyracksDataException { try { IMetadataLockManager lockManager = metadataProvider.getApplicationContext().getMetadataLockManager(); LockList locks = metadataProvider.getLocks(); @@ -191,12 +191,12 @@ public class TestEventsListener extends ActiveEntityEventsListener { } @Override - protected Void doSuspend(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected Void doSuspend(MetadataProvider metadataProvider) throws HyracksDataException { return doStop(metadataProvider); } @Override - protected void doResume(MetadataProvider metadataProvider) throws HyracksDataException, AlgebricksException { + protected void doResume(MetadataProvider metadataProvider) throws HyracksDataException { doStart(metadataProvider); } }
