checkpoint
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
index 94eefb6..d0e398b 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
@@ -1513,11 +1513,7 @@
throw new AsterixException("Feed " + cfs.getDatasetName().getValue()
+ " is currently ACTIVE. Operation not supported");
}
- IDatasetDetails datasetDetails = dataset.getDatasetDetails();
- if (datasetDetails.getDatasetType() != DatasetType.INTERNAL) {
- throw new AsterixException("Dataset " + cfs.getDatasetName().getValue() + " is not an interal dataset");
- }
-
+
FeedPolicy feedPolicy = MetadataManager.INSTANCE.getFeedPolicy(mdTxnCtx, dataverseName,
cbfs.getPolicyName());
if (feedPolicy == null) {
@@ -1599,9 +1595,6 @@
+ " is currently INACTIVE. Operation not supported");
}
- CompiledDisconnectFeedStatement clcfs = new CompiledDisconnectFeedStatement(dataverseName, cfs
- .getFeedName().getValue(), cfs.getDatasetName().getValue());
-
JobSpecification jobSpec = FeedOperations.buildDisconnectFeedJobSpec(dataverseName, cfs.getFeedName()
.getValue(), cfs.getDatasetName().getValue(), metadataProvider, feedActivity);
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/ClusterLifecycleListener.java b/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
index 6461b0c..0dab8dd 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
@@ -106,15 +106,6 @@
}
}
- private void submitWork(Set<IClusterManagementWork> work) {
- try {
- workRequestQueue.put(work);
- } catch (InterruptedException e) {
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Interrupted :" + e.getMessage());
- }
- }
- }
private void updateProgress(ClusterEventType eventType, Set<String> nodeIds) {
List<IClusterManagementWorkResponse> completedResponses = new ArrayList<IClusterManagementWorkResponse>();
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedIntakeOperatorDescriptor.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedIntakeOperatorDescriptor.java
index 5c8c422..10884c2 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedIntakeOperatorDescriptor.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedIntakeOperatorDescriptor.java
@@ -84,7 +84,7 @@
if(LOGGER.isLoggable(Level.SEVERE)){
LOGGER.severe("Initialization of the feed adaptor failed");
}
- throw new HyracksDataException("initialization of adapter failed", e);
+ throw new HyracksDataException("Initialization of the feed adapter failed", e);
}
return new FeedIntakeOperatorNodePushable(ctx, feedId, adapter, feedPolicy, partition, ingestionRuntime);
}