Steven Jacobs has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/644
Change subject: Added Channels to Asterix ...................................................................... Added Channels to Asterix Users can create and delete repetitive channels Users can subscribe to and unsubscribe from channels Users can create and drop brokers Added a few Channel Tests Enhanced Insert AQL Added "return records" and "returning [fieldName]" "return records" returns to the user all records that were inserted "returning [fieldName]" returns only the valuse inserted for [fieldName] Change-Id: I7ac820a08aa3c2225fffb230358c220d81f15908 --- A asterix-active-jobs/pom.xml R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorDescriptor.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorDescriptor.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorDescriptor.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaComputeNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaOperatorDescriptor.java R asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaStoreNodePushable.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IAdapterRuntimeManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ICentralFeedManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IExceptionHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeed.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedConnectionManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedFrameHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedJoint.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleEventSubscriber.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleIntakeEventSubscriber.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleListener.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLoadManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryComponent.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessageService.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetadataManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetricCollector.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedOperatorOutputSideHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedProvider.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedService.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedSubscriptionManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedTrackingManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWork.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkEventListener.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFrameEventCallback.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePostProcessor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePreprocessor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IIntakeProgressTracker.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IMessageReceiver.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscribableRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriberRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriptionProvider.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/CollectTransformFeedFrameWriter.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucket.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucketPool.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DistributeFeedFrameWriter.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedCollectRuntimeInputHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedExceptionHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCache.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCollector.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameDiscarder.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameHandlers.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameSpiller.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleAccessor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleDecorator.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedRuntimeInputHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameCollection.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameDistributor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameEventCallback.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/StorageFrameHandler.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedCollectInfo.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionId.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionRequest.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedId.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedInfo.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedJointKey.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedLifecycleEventSubscriber.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMemoryManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMetadataManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedRuntimeManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedSubscriptionManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedWorkManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/EndFeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedCongestionMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessageService.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedReportMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitAckMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitResponseMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageListener.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageReceiver.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/NodeReportMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/PrepareStallMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/RemoteSocketMessageListener.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ScaleInReportMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/SocketMessageListener.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/StorageReportFeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/TerminateDataFlowMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ThrottlingEnabledFeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/XAQLFeedMessage.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicy.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyAccessor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyEnforcer.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/CollectionRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntimeId.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableFeedRuntimeId.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableRuntime.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/BasicMonitoredBuffer.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/ComputeSideMonitoredBuffer.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedActivity.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedConnectJobInfo.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedIntakeInfo.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedJobInfo.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedMetricCollector.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakePartitionStatistics.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakeSideMonitoredBuffer.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBuffer.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBufferTimerTasks.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoad.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReport.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReportService.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/Series.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesAvg.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesRate.java R asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/StorageSideMonitoredBuffer.java M asterix-app/pom.xml M asterix-app/src/main/java/org/apache/asterix/feed/FeedJobNotificationHandler.java M asterix-app/src/main/java/org/apache/asterix/feed/FeedLifecycleListener.java M asterix-app/src/main/java/org/apache/asterix/file/FeedOperations.java M asterix-metadata/pom.xml M asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java M asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java M pom.xml 133 files changed, 97 insertions(+), 29 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/644/1 diff --git a/asterix-active-jobs/pom.xml b/asterix-active-jobs/pom.xml new file mode 100644 index 0000000..553c6c4 --- /dev/null +++ b/asterix-active-jobs/pom.xml @@ -0,0 +1,57 @@ +<?xml version="1.0"?> +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix</artifactId> + <version>0.8.8-SNAPSHOT</version> + </parent> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active-jobs</artifactId> + <version>0.8.8-SNAPSHOT</version> + <name>asterix-active-jobs</name> + <url>http://maven.apache.org</url> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>0.8.8-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>0.8.8-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>0.8.8-SNAPSHOT</version> + </dependency> + </dependencies> +</project> diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorDescriptor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorDescriptor.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorDescriptor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorDescriptor.java index a929eec..86f71cd 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorDescriptor.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.Map; import java.util.logging.Level; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorNodePushable.java similarity index 99% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorNodePushable.java index 7901f03..8b32536 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedCollectOperatorNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.Map; import java.util.logging.Level; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorDescriptor.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorDescriptor.java index a18ebcd..fd6e507 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.Map; import java.util.logging.Logger; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorNodePushable.java similarity index 97% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorNodePushable.java index 9398fa1..9e1e236 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedIntakeOperatorNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.ArrayList; import java.util.HashMap; @@ -26,14 +26,14 @@ import org.apache.asterix.common.api.IAsterixAppRuntimeContext; import org.apache.asterix.external.api.IAdapterFactory; -import org.apache.asterix.external.api.IAdapterRuntimeManager; -import org.apache.asterix.external.api.IAdapterRuntimeManager.State; import org.apache.asterix.external.api.IFeedAdapter; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager; import org.apache.asterix.external.feed.api.IFeedManager; import org.apache.asterix.external.feed.api.IFeedRuntime.FeedRuntimeType; import org.apache.asterix.external.feed.api.IFeedSubscriptionManager; import org.apache.asterix.external.feed.api.IIntakeProgressTracker; import org.apache.asterix.external.feed.api.ISubscriberRuntime; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager.State; import org.apache.asterix.external.feed.dataflow.DistributeFeedFrameWriter; import org.apache.asterix.external.feed.management.FeedId; import org.apache.asterix.external.feed.policy.FeedPolicyAccessor; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorDescriptor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorDescriptor.java similarity index 97% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorDescriptor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorDescriptor.java index 219110f..8e86850 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorDescriptor.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import org.apache.asterix.external.feed.api.IFeedMessage; import org.apache.asterix.external.feed.management.FeedConnectionId; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorNodePushable.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorNodePushable.java index 3cb5d64..ff1c7cd 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMessageOperatorNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMessageOperatorNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.Map; import java.util.Map.Entry; @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.apache.asterix.common.api.IAsterixAppRuntimeContext; -import org.apache.asterix.external.api.IAdapterRuntimeManager; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager; import org.apache.asterix.external.feed.api.IFeedManager; import org.apache.asterix.external.feed.api.IFeedMessage; import org.apache.asterix.external.feed.api.IFeedRuntime.FeedRuntimeType; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaComputeNodePushable.java similarity index 99% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaComputeNodePushable.java index fa2e513..7a641c1 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaComputeNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.nio.ByteBuffer; import java.util.Map; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaNodePushable.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaNodePushable.java index b09504a..f991786 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.nio.ByteBuffer; import java.util.Map; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaOperatorDescriptor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaOperatorDescriptor.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaOperatorDescriptor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaOperatorDescriptor.java index 9eb6c78..7ca3065 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaOperatorDescriptor.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaOperatorDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.util.Map; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaStoreNodePushable.java similarity index 99% rename from asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaStoreNodePushable.java index 9929358..dba3eed 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/active/operators/FeedMetaStoreNodePushable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.operators; +package org.apache.asterix.active.operators; import java.nio.ByteBuffer; import java.util.Map; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/api/IAdapterRuntimeManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IAdapterRuntimeManager.java similarity index 95% rename from asterix-external-data/src/main/java/org/apache/asterix/external/api/IAdapterRuntimeManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IAdapterRuntimeManager.java index 252b43b..cdd63a3 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/api/IAdapterRuntimeManager.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IAdapterRuntimeManager.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.external.api; +package org.apache.asterix.external.feed.api; -import org.apache.asterix.external.feed.api.IIntakeProgressTracker; +import org.apache.asterix.external.api.IFeedAdapter; import org.apache.asterix.external.feed.management.FeedId; public interface IAdapterRuntimeManager { diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ICentralFeedManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ICentralFeedManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ICentralFeedManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ICentralFeedManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IExceptionHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IExceptionHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IExceptionHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IExceptionHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeed.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeed.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedConnectionManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedConnectionManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedConnectionManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedConnectionManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedFrameHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedFrameHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedFrameHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedFrameHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedJoint.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedJoint.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedJoint.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedJoint.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleEventSubscriber.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleEventSubscriber.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleEventSubscriber.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleEventSubscriber.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleIntakeEventSubscriber.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleIntakeEventSubscriber.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleIntakeEventSubscriber.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleIntakeEventSubscriber.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleListener.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleListener.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleListener.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLifecycleListener.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLoadManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLoadManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedLoadManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedLoadManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryComponent.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryComponent.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryComponent.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryComponent.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMemoryManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMessageService.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessageService.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMessageService.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMessageService.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMetadataManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetadataManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMetadataManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetadataManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMetricCollector.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetricCollector.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedMetricCollector.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedMetricCollector.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedOperatorOutputSideHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedOperatorOutputSideHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedOperatorOutputSideHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedOperatorOutputSideHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedProvider.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedProvider.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedProvider.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedProvider.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedService.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedService.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedService.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedService.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedSubscriptionManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedSubscriptionManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedSubscriptionManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedSubscriptionManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedTrackingManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedTrackingManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedTrackingManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedTrackingManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWork.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWork.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWork.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWork.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkEventListener.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkEventListener.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkEventListener.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkEventListener.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFeedWorkManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFrameEventCallback.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFrameEventCallback.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFrameEventCallback.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFrameEventCallback.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFramePostProcessor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePostProcessor.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFramePostProcessor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePostProcessor.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFramePreprocessor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePreprocessor.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFramePreprocessor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IFramePreprocessor.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IIntakeProgressTracker.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IIntakeProgressTracker.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IIntakeProgressTracker.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IIntakeProgressTracker.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IMessageReceiver.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IMessageReceiver.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IMessageReceiver.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/IMessageReceiver.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscribableRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscribableRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscribableRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscribableRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscriberRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriberRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscriberRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriberRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscriptionProvider.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriptionProvider.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/ISubscriptionProvider.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/api/ISubscriptionProvider.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/CollectTransformFeedFrameWriter.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/CollectTransformFeedFrameWriter.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/CollectTransformFeedFrameWriter.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/CollectTransformFeedFrameWriter.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucket.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucket.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucket.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucket.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucketPool.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucketPool.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucketPool.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DataBucketPool.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DistributeFeedFrameWriter.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DistributeFeedFrameWriter.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/DistributeFeedFrameWriter.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/DistributeFeedFrameWriter.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedCollectRuntimeInputHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedCollectRuntimeInputHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedCollectRuntimeInputHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedCollectRuntimeInputHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedExceptionHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedExceptionHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedExceptionHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedExceptionHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCache.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCache.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCache.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCache.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCollector.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCollector.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCollector.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameCollector.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameDiscarder.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameDiscarder.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameDiscarder.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameDiscarder.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameHandlers.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameHandlers.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameHandlers.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameHandlers.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameSpiller.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameSpiller.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameSpiller.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameSpiller.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleAccessor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleAccessor.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleAccessor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleAccessor.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleDecorator.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleDecorator.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleDecorator.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedFrameTupleDecorator.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedRuntimeInputHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedRuntimeInputHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FeedRuntimeInputHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FeedRuntimeInputHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameCollection.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameCollection.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameCollection.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameCollection.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameDistributor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameDistributor.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameDistributor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameDistributor.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameEventCallback.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameEventCallback.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/FrameEventCallback.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/FrameEventCallback.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/StorageFrameHandler.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/StorageFrameHandler.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/dataflow/StorageFrameHandler.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/dataflow/StorageFrameHandler.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedCollectInfo.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedCollectInfo.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedCollectInfo.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedCollectInfo.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionId.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionId.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionId.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionId.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionRequest.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionRequest.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionRequest.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedConnectionRequest.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedId.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedId.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedId.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedId.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedInfo.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedInfo.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedInfo.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedInfo.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedJointKey.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedJointKey.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedJointKey.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedJointKey.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedLifecycleEventSubscriber.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedLifecycleEventSubscriber.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedLifecycleEventSubscriber.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedLifecycleEventSubscriber.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedMemoryManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMemoryManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedMemoryManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMemoryManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedMetadataManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMetadataManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedMetadataManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedMetadataManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedRuntimeManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedRuntimeManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedRuntimeManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedRuntimeManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedSubscriptionManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedSubscriptionManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedSubscriptionManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedSubscriptionManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedWorkManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedWorkManager.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/management/FeedWorkManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/management/FeedWorkManager.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/EndFeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/EndFeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/EndFeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/EndFeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedCongestionMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedCongestionMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedCongestionMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedCongestionMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedMessageService.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessageService.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedMessageService.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedMessageService.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedReportMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedReportMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedReportMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedReportMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitAckMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitAckMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitAckMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitAckMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitResponseMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitResponseMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitResponseMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/FeedTupleCommitResponseMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/MessageListener.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageListener.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/MessageListener.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageListener.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/MessageReceiver.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageReceiver.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/MessageReceiver.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/MessageReceiver.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/NodeReportMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/NodeReportMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/NodeReportMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/NodeReportMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/PrepareStallMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/PrepareStallMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/PrepareStallMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/PrepareStallMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/RemoteSocketMessageListener.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/RemoteSocketMessageListener.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/RemoteSocketMessageListener.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/RemoteSocketMessageListener.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/ScaleInReportMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ScaleInReportMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/ScaleInReportMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ScaleInReportMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/SocketMessageListener.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/SocketMessageListener.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/SocketMessageListener.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/SocketMessageListener.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/StorageReportFeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/StorageReportFeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/StorageReportFeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/StorageReportFeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/TerminateDataFlowMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/TerminateDataFlowMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/TerminateDataFlowMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/TerminateDataFlowMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/ThrottlingEnabledFeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ThrottlingEnabledFeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/ThrottlingEnabledFeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/ThrottlingEnabledFeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/XAQLFeedMessage.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/XAQLFeedMessage.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/message/XAQLFeedMessage.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/message/XAQLFeedMessage.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicy.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicy.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicy.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicy.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyAccessor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyAccessor.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyAccessor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyAccessor.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyEnforcer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyEnforcer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyEnforcer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/policy/FeedPolicyEnforcer.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java similarity index 95% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java index 3ac28c9..9ffc687 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterExecutor.java @@ -18,9 +18,9 @@ */ package org.apache.asterix.external.feed.runtime; -import org.apache.asterix.external.api.IAdapterRuntimeManager; -import org.apache.asterix.external.api.IAdapterRuntimeManager.State; import org.apache.asterix.external.api.IFeedAdapter; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager.State; import org.apache.asterix.external.feed.dataflow.DistributeFeedFrameWriter; import org.apache.asterix.external.util.ExternalDataExceptionUtils; import org.apache.log4j.Logger; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java similarity index 98% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java index 6c3e44d..075c81c 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/AdapterRuntimeManager.java @@ -22,8 +22,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.asterix.external.api.IAdapterRuntimeManager; import org.apache.asterix.external.api.IFeedAdapter; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager; import org.apache.asterix.external.feed.api.IIntakeProgressTracker; import org.apache.asterix.external.feed.dataflow.DistributeFeedFrameWriter; import org.apache.asterix.external.feed.management.FeedId; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/CollectionRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/CollectionRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/CollectionRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/CollectionRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntimeId.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntimeId.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntimeId.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/FeedRuntimeId.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java similarity index 97% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java index 34cb575..05fd784 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java +++ b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/IngestionRuntime.java @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; import java.util.logging.Level; -import org.apache.asterix.external.api.IAdapterRuntimeManager; +import org.apache.asterix.external.feed.api.IAdapterRuntimeManager; import org.apache.asterix.external.feed.dataflow.DistributeFeedFrameWriter; import org.apache.asterix.external.feed.dataflow.FeedFrameCollector; import org.apache.asterix.external.feed.dataflow.FrameDistributor; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableFeedRuntimeId.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableFeedRuntimeId.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableFeedRuntimeId.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableFeedRuntimeId.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableRuntime.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableRuntime.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableRuntime.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/runtime/SubscribableRuntime.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/BasicMonitoredBuffer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/BasicMonitoredBuffer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/BasicMonitoredBuffer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/BasicMonitoredBuffer.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/ComputeSideMonitoredBuffer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/ComputeSideMonitoredBuffer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/ComputeSideMonitoredBuffer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/ComputeSideMonitoredBuffer.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedActivity.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedActivity.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedActivity.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedActivity.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedConnectJobInfo.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedConnectJobInfo.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedConnectJobInfo.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedConnectJobInfo.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedIntakeInfo.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedIntakeInfo.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedIntakeInfo.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedIntakeInfo.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedJobInfo.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedJobInfo.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedJobInfo.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedJobInfo.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedMetricCollector.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedMetricCollector.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/FeedMetricCollector.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/FeedMetricCollector.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/IntakePartitionStatistics.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakePartitionStatistics.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/IntakePartitionStatistics.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakePartitionStatistics.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/IntakeSideMonitoredBuffer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakeSideMonitoredBuffer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/IntakeSideMonitoredBuffer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/IntakeSideMonitoredBuffer.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBuffer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBuffer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBuffer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBuffer.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBufferTimerTasks.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBufferTimerTasks.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBufferTimerTasks.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/MonitoredBufferTimerTasks.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoad.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoad.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoad.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoad.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReport.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReport.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReport.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReport.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReportService.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReportService.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReportService.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/NodeLoadReportService.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/Series.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/Series.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/Series.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/Series.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/SeriesAvg.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesAvg.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/SeriesAvg.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesAvg.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/SeriesRate.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesRate.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/SeriesRate.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/SeriesRate.java diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/StorageSideMonitoredBuffer.java b/asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/StorageSideMonitoredBuffer.java similarity index 100% rename from asterix-external-data/src/main/java/org/apache/asterix/external/feed/watch/StorageSideMonitoredBuffer.java rename to asterix-active-jobs/src/main/java/org/apache/asterix/external/feed/watch/StorageSideMonitoredBuffer.java diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml index 9b87d9f..3b37086 100644 --- a/asterix-app/pom.xml +++ b/asterix-app/pom.xml @@ -243,5 +243,10 @@ <artifactId>asterix-external-data</artifactId> <version>0.8.8-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active-jobs</artifactId> + <version>0.8.8-SNAPSHOT</version> + </dependency> </dependencies> </project> diff --git a/asterix-app/src/main/java/org/apache/asterix/feed/FeedJobNotificationHandler.java b/asterix-app/src/main/java/org/apache/asterix/feed/FeedJobNotificationHandler.java index 49b88ca..7e58a40 100644 --- a/asterix-app/src/main/java/org/apache/asterix/feed/FeedJobNotificationHandler.java +++ b/asterix-app/src/main/java/org/apache/asterix/feed/FeedJobNotificationHandler.java @@ -33,6 +33,9 @@ import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; +import org.apache.asterix.active.operators.FeedCollectOperatorDescriptor; +import org.apache.asterix.active.operators.FeedIntakeOperatorDescriptor; +import org.apache.asterix.active.operators.FeedMetaOperatorDescriptor; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.external.feed.api.IFeedJoint; import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber; @@ -52,9 +55,6 @@ import org.apache.asterix.external.feed.watch.FeedJobInfo; import org.apache.asterix.external.feed.watch.FeedJobInfo.FeedJobState; import org.apache.asterix.external.feed.watch.FeedJobInfo.JobType; -import org.apache.asterix.external.operators.FeedCollectOperatorDescriptor; -import org.apache.asterix.external.operators.FeedIntakeOperatorDescriptor; -import org.apache.asterix.external.operators.FeedMetaOperatorDescriptor; import org.apache.asterix.feed.FeedLifecycleListener.Message; import org.apache.asterix.feed.FeedWorkCollection.SubscribeFeedWork; import org.apache.asterix.metadata.feeds.BuiltinFeedPolicies; diff --git a/asterix-app/src/main/java/org/apache/asterix/feed/FeedLifecycleListener.java b/asterix-app/src/main/java/org/apache/asterix/feed/FeedLifecycleListener.java index aac3675..3e832fb 100644 --- a/asterix-app/src/main/java/org/apache/asterix/feed/FeedLifecycleListener.java +++ b/asterix-app/src/main/java/org/apache/asterix/feed/FeedLifecycleListener.java @@ -33,6 +33,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.asterix.active.operators.FeedCollectOperatorDescriptor; +import org.apache.asterix.active.operators.FeedIntakeOperatorDescriptor; import org.apache.asterix.api.common.SessionConfig; import org.apache.asterix.api.common.SessionConfig.OutputFormat; import org.apache.asterix.aql.translator.QueryTranslator; @@ -55,8 +57,6 @@ import org.apache.asterix.external.feed.watch.FeedIntakeInfo; import org.apache.asterix.external.feed.watch.FeedJobInfo; import org.apache.asterix.external.feed.watch.FeedJobInfo.FeedJobState; -import org.apache.asterix.external.operators.FeedCollectOperatorDescriptor; -import org.apache.asterix.external.operators.FeedIntakeOperatorDescriptor; import org.apache.asterix.lang.common.base.Statement; import org.apache.asterix.lang.common.statement.DataverseDecl; import org.apache.asterix.lang.common.statement.DisconnectFeedStatement; diff --git a/asterix-app/src/main/java/org/apache/asterix/file/FeedOperations.java b/asterix-app/src/main/java/org/apache/asterix/file/FeedOperations.java index 6a036c0..a854948 100644 --- a/asterix-app/src/main/java/org/apache/asterix/file/FeedOperations.java +++ b/asterix-app/src/main/java/org/apache/asterix/file/FeedOperations.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; +import org.apache.asterix.active.operators.FeedMessageOperatorDescriptor; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.feed.api.IFeedJoint; @@ -35,7 +36,6 @@ import org.apache.asterix.external.feed.message.ThrottlingEnabledFeedMessage; import org.apache.asterix.external.feed.policy.FeedPolicyAccessor; import org.apache.asterix.external.feed.watch.FeedConnectJobInfo; -import org.apache.asterix.external.operators.FeedMessageOperatorDescriptor; import org.apache.asterix.external.util.FeedConstants; import org.apache.asterix.feed.FeedLifecycleListener; import org.apache.asterix.metadata.declared.AqlMetadataProvider; diff --git a/asterix-metadata/pom.xml b/asterix-metadata/pom.xml index d665a15..5cb6d5e 100644 --- a/asterix-metadata/pom.xml +++ b/asterix-metadata/pom.xml @@ -85,5 +85,10 @@ <artifactId>asterix-external-data</artifactId> <version>0.8.8-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active-jobs</artifactId> + <version>0.8.8-SNAPSHOT</version> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java index f3523da..4b00df0 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java @@ -28,6 +28,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.asterix.active.operators.FeedCollectOperatorDescriptor; +import org.apache.asterix.active.operators.FeedIntakeOperatorDescriptor; import org.apache.asterix.common.config.AsterixStorageProperties; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp; @@ -63,8 +65,6 @@ import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; import org.apache.asterix.external.operators.ExternalLookupOperatorDescriptor; import org.apache.asterix.external.operators.ExternalRTreeSearchOperatorDescriptor; -import org.apache.asterix.external.operators.FeedCollectOperatorDescriptor; -import org.apache.asterix.external.operators.FeedIntakeOperatorDescriptor; import org.apache.asterix.external.provider.AdapterFactoryProvider; import org.apache.asterix.external.util.FeedConstants; import org.apache.asterix.formats.base.IDataFormat; diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java index 7ef51cb..b4eb07e 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java @@ -30,6 +30,8 @@ import java.util.logging.Logger; import org.apache.asterix.common.config.DatasetConfig.DatasetType; +import org.apache.asterix.active.operators.FeedCollectOperatorDescriptor; +import org.apache.asterix.active.operators.FeedMetaOperatorDescriptor; import org.apache.asterix.common.config.MetadataConstants; import org.apache.asterix.common.dataflow.AsterixLSMInvertedIndexInsertDeleteOperatorDescriptor; import org.apache.asterix.common.dataflow.AsterixLSMTreeInsertDeleteOperatorDescriptor; @@ -43,8 +45,6 @@ import org.apache.asterix.external.feed.policy.FeedPolicyAccessor; import org.apache.asterix.external.feed.runtime.FeedRuntimeId; import org.apache.asterix.external.library.ExternalLibraryManager; -import org.apache.asterix.external.operators.FeedCollectOperatorDescriptor; -import org.apache.asterix.external.operators.FeedMetaOperatorDescriptor; import org.apache.asterix.external.provider.AdapterFactoryProvider; import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.ExternalDataUtils; diff --git a/pom.xml b/pom.xml index 685e1be..4cbe870 100644 --- a/pom.xml +++ b/pom.xml @@ -371,6 +371,7 @@ <module>asterix-fuzzyjoin</module> <module>asterix-yarn</module> <module>asterix-replication</module> + <module>asterix-active-jobs</module> </modules> <repositories> -- To view, visit https://asterix-gerrit.ics.uci.edu/644 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ac820a08aa3c2225fffb230358c220d81f15908 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs <[email protected]>
