You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by am...@apache.org on 2017/03/10 08:14:23 UTC
[4/6] asterixdb git commit: Unify structure of Cluster Controller and
Node Controller
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java
index 2b899d9..3d1297d 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java
@@ -41,7 +41,6 @@ import org.apache.asterix.external.provider.StreamRecordReaderProvider.Format;
import org.apache.asterix.external.util.ExternalDataConstants;
import org.apache.asterix.external.util.ExternalDataUtils;
import org.apache.asterix.external.util.HDFSUtils;
-import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RecordReader;
@@ -129,18 +128,22 @@ public class HDFSDataSourceFactory implements IRecordReaderFactory<Object>, IInd
public AsterixInputStream createInputStream(IHyracksTaskContext ctx, int partition, IExternalIndexer indexer)
throws HyracksDataException {
try {
- if (!configured) {
- conf = confFactory.getConf();
- inputSplits = inputSplitsFactory.getSplits();
- nodeName = ctx.getJobletContext().getApplicationContext().getNodeId();
- configured = true;
- }
+ restoreConfig(ctx);
return new HDFSInputStream(read, inputSplits, readSchedule, nodeName, conf, configuration, files, indexer);
} catch (Exception e) {
throw new HyracksDataException(e);
}
}
+ private void restoreConfig(IHyracksTaskContext ctx) throws HyracksDataException {
+ if (!configured) {
+ conf = confFactory.getConf();
+ inputSplits = inputSplitsFactory.getSplits();
+ nodeName = ctx.getJobletContext().getServiceContext().getNodeId();
+ configured = true;
+ }
+ }
+
/**
* Get the cluster locations for this input stream factory. This method specifies on which asterix nodes the
* external
@@ -202,11 +205,8 @@ public class HDFSDataSourceFactory implements IRecordReaderFactory<Object>, IInd
return streamReader;
}
}
- JobConf conf = confFactory.getConf();
- InputSplit[] inputSplits = inputSplitsFactory.getSplits();
- String nodeName = ctx.getJobletContext().getApplicationContext().getNodeId();
- return new HDFSRecordReader<Object, Writable>(read, inputSplits, readSchedule, nodeName, conf, files,
- indexer);
+ restoreConfig(ctx);
+ return new HDFSRecordReader<>(read, inputSplits, readSchedule, nodeName, conf, files, indexer);
} catch (Exception e) {
throw new HyracksDataException(e);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
index f877796..a2e3704 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
@@ -60,7 +60,7 @@ public class LocalFSInputStreamFactory implements IInputStreamFactory {
public synchronized AsterixInputStream createInputStream(IHyracksTaskContext ctx, int partition)
throws HyracksDataException {
if (watcher == null) {
- String nodeName = ctx.getJobletContext().getApplicationContext().getNodeId();
+ String nodeName = ctx.getJobletContext().getServiceContext().getNodeId();
ArrayList<Path> inputResources = new ArrayList<>();
for (int i = 0; i < inputFileSplits.length; i++) {
if (inputFileSplits[i].getNodeName().equals(nodeName)) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java
index c80aebc..866fd9c 100755
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java
@@ -76,7 +76,7 @@ public abstract class ExternalFunction implements IExternalFunction {
} else {
// Gets the library manager for real runtime evaluation.
IAppRuntimeContext runtimeCtx = (IAppRuntimeContext) context.getJobletContext()
- .getApplicationContext().getApplicationObject();
+ .getServiceContext().getApplicationContext();
libraryManager = runtimeCtx.getLibraryManager();
}
ClassLoader libraryClassLoader = libraryManager.getLibraryClassLoader(dataverse, functionLibary);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java
index 384da84..bdc11f5 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedCollectOperatorNodePushable.java
@@ -51,8 +51,8 @@ public class FeedCollectOperatorNodePushable extends AbstractUnaryInputUnaryOutp
this.partition = partition;
this.connectionId = feedConnectionId;
this.policyAccessor = new FeedPolicyAccessor(feedPolicy);
- this.activeManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext()
- .getApplicationObject()).getActiveManager();
+ this.activeManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext()
+ .getApplicationContext()).getActiveManager();
}
@Override
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java
index ab8c8f7..b911bf1 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java
@@ -103,7 +103,7 @@ public class FeedIntakeOperatorDescriptor extends AbstractSingleActivityOperator
private IAdapterFactory createExternalAdapterFactory(IHyracksTaskContext ctx) throws HyracksDataException {
IAdapterFactory adapterFactory;
IAppRuntimeContext runtimeCtx = (IAppRuntimeContext) ctx.getJobletContext()
- .getApplicationContext().getApplicationObject();
+ .getServiceContext().getApplicationContext();
ILibraryManager libraryManager = runtimeCtx.getLibraryManager();
ClassLoader classLoader = libraryManager.getLibraryClassLoader(feedId.getDataverse(), adaptorLibraryName);
if (classLoader != null) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java
index ed017a3..fbdbece 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java
@@ -104,8 +104,8 @@ public class FeedMetaComputeNodePushable extends AbstractUnaryInputUnaryOutputOp
this.policyEnforcer = new FeedPolicyEnforcer(feedConnectionId, feedPolicyProperties);
this.partition = partition;
this.connectionId = feedConnectionId;
- this.feedManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext()
- .getApplicationObject()).getActiveManager();
+ this.feedManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext()
+ .getApplicationContext()).getActiveManager();
this.message = new VSizeFrame(ctx);
TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx);
this.opDesc = feedMetaOperatorDescriptor;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java
index 48276d5..0bb27db 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java
@@ -97,8 +97,8 @@ public class FeedMetaStoreNodePushable extends AbstractUnaryInputUnaryOutputOper
this.policyEnforcer = new FeedPolicyEnforcer(feedConnectionId, feedPolicyProperties);
this.partition = partition;
this.connectionId = feedConnectionId;
- this.feedManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext()
- .getApplicationObject()).getActiveManager();
+ this.feedManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext()
+ .getApplicationContext()).getActiveManager();
this.targetId = targetId;
this.message = new VSizeFrame(ctx);
TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
index 53a46ab..def3ee2 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
@@ -52,7 +52,7 @@ import org.apache.hyracks.hdfs.scheduler.Scheduler;
public class HDFSUtils {
public static Scheduler initializeHDFSScheduler() throws HyracksDataException {
- ICCContext ccContext = AppContextInfo.INSTANCE.getCCApplicationContext().getCCContext();
+ ICCContext ccContext = AppContextInfo.INSTANCE.getCCServiceContext().getCCContext();
Scheduler scheduler = null;
try {
scheduler = new Scheduler(ccContext.getClusterControllerInfo().getClientNetAddress(),
@@ -64,7 +64,7 @@ public class HDFSUtils {
}
public static IndexingScheduler initializeIndexingHDFSScheduler() throws HyracksDataException {
- ICCContext ccContext = AppContextInfo.INSTANCE.getCCApplicationContext().getCCContext();
+ ICCContext ccContext = AppContextInfo.INSTANCE.getCCServiceContext().getCCContext();
IndexingScheduler scheduler = null;
try {
scheduler = new IndexingScheduler(ccContext.getClusterControllerInfo().getClientNetAddress(),
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java
index 3863920..a108908 100644
--- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java
+++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java
@@ -39,7 +39,6 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.std.file.ITupleParser;
import org.apache.hyracks.dataflow.std.file.ITupleParserFactory;
@@ -69,7 +68,7 @@ public class TestTypedAdapterFactory implements IAdapterFactory {
@Override
public IDataSourceAdapter createAdapter(IHyracksTaskContext ctx, int partition) throws HyracksDataException {
- final String nodeId = ctx.getJobletContext().getApplicationContext().getNodeId();
+ final String nodeId = ctx.getJobletContext().getServiceContext().getNodeId();
final ITupleParserFactory tupleParserFactory = new ITupleParserFactory() {
private static final long serialVersionUID = 1L;
@@ -79,8 +78,7 @@ public class TestTypedAdapterFactory implements IAdapterFactory {
ITupleForwarder forwarder;
ArrayTupleBuilder tb;
IPropertiesProvider propertiesProvider =
- (IPropertiesProvider) ((NodeControllerService) ctx.getJobletContext().getApplicationContext()
- .getControllerService()).getApplicationContext().getApplicationObject();
+ (IPropertiesProvider) ctx.getJobletContext().getServiceContext().getApplicationContext();
ClusterPartition nodePartition =
propertiesProvider.getMetadataProperties().getNodePartitions().get(nodeId)[0];
parser = new ADMDataParser(outputType, true);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataExtension.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataExtension.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataExtension.java
index 5626a83..ef624ed 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataExtension.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataExtension.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.asterix.common.api.IExtension;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.metadata.entitytupletranslators.MetadataTupleTranslatorProvider;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
/**
@@ -57,6 +57,6 @@ public interface IMetadataExtension extends IExtension {
* @throws RemoteException
* @throws ACIDException
*/
- void initializeMetadata(INCApplicationContext appCtx) throws HyracksDataException, RemoteException, ACIDException;
+ void initializeMetadata(INCServiceContext ncServiceCtx) throws HyracksDataException, RemoteException, ACIDException;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
index 02a092d..0410911 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
@@ -71,7 +71,7 @@ import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOpera
import org.apache.asterix.transaction.management.resource.LSMBTreeLocalResourceMetadata;
import org.apache.asterix.transaction.management.resource.PersistentLocalResourceFactoryProvider;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants.LockManagerConstants.LockMode;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -106,7 +106,7 @@ import org.apache.hyracks.storage.common.file.LocalResource;
public class MetadataBootstrap {
public static final boolean IS_DEBUG_MODE = false;
private static final Logger LOGGER = Logger.getLogger(MetadataBootstrap.class.getName());
- private static IAppRuntimeContext runtimeContext;
+ private static IAppRuntimeContext appContext;
private static IBufferCache bufferCache;
private static IFileMapProvider fileMapProvider;
private static IDatasetLifecycleManager dataLifecycleManager;
@@ -132,26 +132,26 @@ public class MetadataBootstrap {
* bootstrap metadata
*
* @param asterixPropertiesProvider
- * @param ncApplicationContext
+ * @param ncServiceContext
* @param isNewUniverse
* @throws ACIDException
* @throws RemoteException
* @throws MetadataException
* @throws Exception
*/
- public static void startUniverse(INCApplicationContext ncApplicationContext, boolean isNewUniverse)
+ public static void startUniverse(INCServiceContext ncServiceContext, boolean isNewUniverse)
throws RemoteException, ACIDException, MetadataException {
MetadataBootstrap.setNewUniverse(isNewUniverse);
- runtimeContext = (IAppRuntimeContext) ncApplicationContext.getApplicationObject();
+ appContext = (IAppRuntimeContext) ncServiceContext.getApplicationContext();
- MetadataProperties metadataProperties = runtimeContext.getMetadataProperties();
+ MetadataProperties metadataProperties = appContext.getMetadataProperties();
metadataNodeName = metadataProperties.getMetadataNodeName();
nodeNames = metadataProperties.getNodeNames();
- dataLifecycleManager = runtimeContext.getDatasetLifecycleManager();
- localResourceRepository = runtimeContext.getLocalResourceRepository();
- bufferCache = runtimeContext.getBufferCache();
- fileMapProvider = runtimeContext.getFileMapManager();
- ioManager = ncApplicationContext.getIoManager();
+ dataLifecycleManager = appContext.getDatasetLifecycleManager();
+ localResourceRepository = appContext.getLocalResourceRepository();
+ bufferCache = appContext.getBufferCache();
+ fileMapProvider = appContext.getFileMapManager();
+ ioManager = ncServiceContext.getIoManager();
MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
try {
@@ -160,7 +160,7 @@ public class MetadataBootstrap {
MetadataManager.INSTANCE.lock(mdTxnCtx, LockMode.X);
for (int i = 0; i < PRIMARY_INDEXES.length; i++) {
- enlistMetadataDataset(ncApplicationContext, PRIMARY_INDEXES[i]);
+ enlistMetadataDataset(ncServiceContext, PRIMARY_INDEXES[i]);
}
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(
@@ -327,9 +327,9 @@ public class MetadataBootstrap {
* @param index
* @throws HyracksDataException
*/
- public static void enlistMetadataDataset(INCApplicationContext appCtx, IMetadataIndex index)
+ public static void enlistMetadataDataset(INCServiceContext ncServiceCtx, IMetadataIndex index)
throws HyracksDataException {
- ClusterPartition metadataPartition = runtimeContext.getMetadataProperties().getMetadataPartition();
+ ClusterPartition metadataPartition = appContext.getMetadataProperties().getMetadataPartition();
int metadataDeviceId = metadataPartition.getIODeviceNum();
String metadataPartitionPath = StoragePathUtil.prepareStoragePartitionPath(
ClusterProperties.INSTANCE.getStorageDirectoryName(), metadataPartition.getPartitionId());
@@ -338,7 +338,7 @@ public class MetadataBootstrap {
// this should not be done this way. dataset lifecycle manager shouldn't return virtual buffer caches for
// a dataset that was not yet created
- List<IVirtualBufferCache> virtualBufferCaches = runtimeContext.getDatasetLifecycleManager()
+ List<IVirtualBufferCache> virtualBufferCaches = appContext.getDatasetLifecycleManager()
.getVirtualBufferCaches(index.getDatasetId().getId(), metadataPartition.getIODeviceNum());
ITypeTraits[] typeTraits = index.getTypeTraits();
IBinaryComparatorFactory[] comparatorFactories = index.getKeyBinaryComparatorFactory();
@@ -357,19 +357,19 @@ public class MetadataBootstrap {
// This is to be done by having a metadata dataset associated with each index
lsmBtree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, bufferCache, fileMapProvider,
typeTraits, comparatorFactories, bloomFilterKeyFields,
- runtimeContext.getBloomFilterFalsePositiveRate(),
- runtimeContext.getMetadataMergePolicyFactory().createMergePolicy(
+ appContext.getBloomFilterFalsePositiveRate(),
+ appContext.getMetadataMergePolicyFactory().createMergePolicy(
GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, dataLifecycleManager),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContext.getLSMIOScheduler(),
+ opTrackerProvider.getOperationTracker(ncServiceCtx), appContext.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), index.isPrimaryIndex(), null, null, null, null, true,
- runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory());
+ appContext.getStorageComponentProvider().getMetadataPageManagerFactory());
lsmBtree.create();
resourceID = index.getResourceID();
Resource localResourceMetadata = new LSMBTreeLocalResourceMetadata(typeTraits, comparatorFactories,
bloomFilterKeyFields, index.isPrimaryIndex(), index.getDatasetId().getId(),
- metadataPartition.getPartitionId(), runtimeContext.getMetadataMergePolicyFactory(),
+ metadataPartition.getPartitionId(), appContext.getMetadataMergePolicyFactory(),
GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, null, null, null, null, opTrackerProvider,
- ioOpCallbackFactory, runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory());
+ ioOpCallbackFactory, appContext.getStorageComponentProvider().getMetadataPageManagerFactory());
ILocalResourceFactoryProvider localResourceFactoryProvider = new PersistentLocalResourceFactoryProvider(
partition -> localResourceMetadata, LocalResource.LSMBTreeResource);
ILocalResourceFactory localResourceFactory = localResourceFactoryProvider.getLocalResourceFactory();
@@ -380,8 +380,8 @@ public class MetadataBootstrap {
final LocalResource resource = localResourceRepository.get(file.getRelativePath());
if (resource == null) {
throw new HyracksDataException("Could not find required metadata indexes. Please delete "
- + runtimeContext.getMetadataProperties().getTransactionLogDirs()
- .get(runtimeContext.getTransactionSubsystem().getId())
+ + appContext.getMetadataProperties().getTransactionLogDirs()
+ .get(appContext.getTransactionSubsystem().getId())
+ " to intialize as a new instance. (WARNING: all data will be lost.)");
}
resourceID = resource.getId();
@@ -392,13 +392,13 @@ public class MetadataBootstrap {
if (lsmBtree == null) {
lsmBtree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, bufferCache,
fileMapProvider, typeTraits, comparatorFactories, bloomFilterKeyFields,
- runtimeContext.getBloomFilterFalsePositiveRate(),
- runtimeContext.getMetadataMergePolicyFactory().createMergePolicy(
+ appContext.getBloomFilterFalsePositiveRate(),
+ appContext.getMetadataMergePolicyFactory().createMergePolicy(
GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, dataLifecycleManager),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContext.getLSMIOScheduler(),
+ opTrackerProvider.getOperationTracker(ncServiceCtx), appContext.getLSMIOScheduler(),
LSMBTreeIOOperationCallbackFactory.INSTANCE.createIoOpCallback(), index.isPrimaryIndex(), null,
null, null, null, true,
- runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory());
+ appContext.getStorageComponentProvider().getMetadataPageManagerFactory());
dataLifecycleManager.register(file.getRelativePath(), lsmBtree);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
index afc1dfd..f02496a 100644
--- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
+++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
@@ -73,7 +73,7 @@ import org.apache.asterix.replication.storage.LSMComponentProperties;
import org.apache.asterix.replication.storage.LSMIndexFileProperties;
import org.apache.asterix.replication.storage.ReplicaResourcesManager;
import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
import org.apache.hyracks.util.StorageUtil;
@@ -109,7 +109,7 @@ public class ReplicationChannel extends Thread implements IReplicationChannel {
public ReplicationChannel(String nodeId, ReplicationProperties replicationProperties, ILogManager logManager,
IReplicaResourcesManager replicaResoucesManager, IReplicationManager replicationManager,
- INCApplicationContext appContext, IAppRuntimeContextProvider asterixAppRuntimeContextProvider) {
+ INCServiceContext ncServiceContext, IAppRuntimeContextProvider asterixAppRuntimeContextProvider) {
this.logManager = logManager;
this.localNodeID = nodeId;
this.replicaResourcesManager = (ReplicaResourcesManager) replicaResoucesManager;
@@ -125,9 +125,9 @@ public class ReplicationChannel extends Thread implements IReplicationChannel {
replicaUniqueLSN2RemoteMapping = new ConcurrentHashMap<>();
lsmComponentLSNMappingService = new LSMComponentsSyncService();
replicationNotifier = new ReplicationNotifier();
- replicationThreads = Executors.newCachedThreadPool(appContext.getThreadFactory());
- Map<String, ClusterPartition[]> nodePartitions = ((IPropertiesProvider) asterixAppRuntimeContextProvider
- .getAppContext()).getMetadataProperties().getNodePartitions();
+ replicationThreads = Executors.newCachedThreadPool(ncServiceContext.getThreadFactory());
+ Map<String, ClusterPartition[]> nodePartitions =
+ asterixAppRuntimeContextProvider.getAppContext().getMetadataProperties().getNodePartitions();
Set<String> nodeReplicationClients = replicationProperties.getRemotePrimaryReplicasIds(nodeId);
List<Integer> clientsPartitions = new ArrayList<>();
for (String clientId : nodeReplicationClients) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
index 899b0b9..7ec5691 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
@@ -51,8 +51,8 @@ public class JobEventListenerFactory implements IJobletEventListenerFactory {
@Override
public void jobletFinish(JobStatus jobStatus) {
try {
- ITransactionManager txnManager = ((IAppRuntimeContext) jobletContext.getApplicationContext()
- .getApplicationObject()).getTransactionSubsystem().getTransactionManager();
+ ITransactionManager txnManager = ((IAppRuntimeContext) jobletContext.getServiceContext()
+ .getApplicationContext()).getTransactionSubsystem().getTransactionManager();
ITransactionContext txnContext = txnManager.getTransactionContext(jobId, false);
txnContext.setWriteTxn(transactionalWrite);
txnManager.completedTransaction(txnContext, new DatasetId(-1), -1,
@@ -65,7 +65,7 @@ public class JobEventListenerFactory implements IJobletEventListenerFactory {
@Override
public void jobletStart() {
try {
- ((IAppRuntimeContext) jobletContext.getApplicationContext().getApplicationObject())
+ ((IAppRuntimeContext) jobletContext.getServiceContext().getApplicationContext())
.getTransactionSubsystem().getTransactionManager().getTransactionContext(jobId, true);
} catch (ACIDException e) {
throw new Error(e);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
index 749de60..ac1895b 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
@@ -54,7 +54,7 @@ public class MultiTransactionJobletEventListenerFactory implements IJobletEventL
public void jobletFinish(JobStatus jobStatus) {
try {
ITransactionManager txnManager =
- ((IAppRuntimeContext) jobletContext.getApplicationContext().getApplicationObject())
+ ((IAppRuntimeContext) jobletContext.getServiceContext().getApplicationContext())
.getTransactionSubsystem().getTransactionManager();
for (JobId jobId : jobIds) {
ITransactionContext txnContext = txnManager.getTransactionContext(jobId, false);
@@ -71,7 +71,7 @@ public class MultiTransactionJobletEventListenerFactory implements IJobletEventL
public void jobletStart() {
try {
for (JobId jobId : jobIds) {
- ((IAppRuntimeContext) jobletContext.getApplicationContext().getApplicationObject())
+ ((IAppRuntimeContext) jobletContext.getServiceContext().getApplicationContext())
.getTransactionSubsystem().getTransactionManager().getTransactionContext(jobId, true);
}
} catch (ACIDException e) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReplicaEventMessage.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReplicaEventMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReplicaEventMessage.java
index 1ee0399..8eb3663 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReplicaEventMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReplicaEventMessage.java
@@ -26,7 +26,6 @@ import org.apache.asterix.event.schema.cluster.Node;
import org.apache.hyracks.api.application.IClusterLifecycleListener.ClusterEventType;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.service.IControllerService;
-import org.apache.hyracks.control.nc.NodeControllerService;
public class ReplicaEventMessage implements IApplicationMessage {
@@ -55,9 +54,7 @@ public class ReplicaEventMessage implements IApplicationMessage {
@Override
public void handle(IControllerService cs) throws HyracksDataException, InterruptedException {
- NodeControllerService ncs = (NodeControllerService) cs;
- IAppRuntimeContext appContext =
- (IAppRuntimeContext) ncs.getApplicationContext().getApplicationObject();
+ IAppRuntimeContext appContext = (IAppRuntimeContext) cs.getApplicationContext();
Node node = new Node();
node.setId(nodeId);
node.setClusterIp(nodeIPAddress);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
index 042837b..fc2650e 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
@@ -55,13 +55,12 @@ public class ReportMaxResourceIdMessage implements IApplicationMessage {
public static void send(NodeControllerService cs) throws HyracksDataException {
NodeControllerService ncs = cs;
- IAppRuntimeContext appContext =
- (IAppRuntimeContext) ncs.getApplicationContext().getApplicationObject();
+ IAppRuntimeContext appContext = (IAppRuntimeContext) ncs.getApplicationContext();
long maxResourceId = Math.max(appContext.getLocalResourceRepository().maxId(),
MetadataIndexImmutableProperties.FIRST_AVAILABLE_USER_DATASET_ID);
ReportMaxResourceIdMessage maxResourceIdMsg = new ReportMaxResourceIdMessage(ncs.getId(), maxResourceId);
try {
- ((INCMessageBroker) ncs.getApplicationContext().getMessageBroker()).sendMessageToCC(maxResourceIdMsg);
+ ((INCMessageBroker) ncs.getContext().getMessageBroker()).sendMessageToCC(maxResourceIdMsg);
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Unable to report max local resource id", e);
throw HyracksDataException.create(e);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
index 8739948..c8aef37 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
@@ -40,7 +40,7 @@ public class ResourceIdRequestMessage implements IApplicationMessage {
public void handle(IControllerService cs) throws HyracksDataException, InterruptedException {
try {
ICCMessageBroker broker =
- (ICCMessageBroker) AppContextInfo.INSTANCE.getCCApplicationContext().getMessageBroker();
+ (ICCMessageBroker) AppContextInfo.INSTANCE.getCCServiceContext().getMessageBroker();
ResourceIdRequestResponseMessage reponse = new ResourceIdRequestResponseMessage();
if (!ClusterStateManager.INSTANCE.isClusterActive()) {
reponse.setResourceId(-1);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestResponseMessage.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestResponseMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestResponseMessage.java
index db6afb7..1106da9 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestResponseMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestResponseMessage.java
@@ -23,7 +23,6 @@ import org.apache.asterix.common.messaging.api.IApplicationMessage;
import org.apache.asterix.runtime.transaction.GlobalResourceIdFactory;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.service.IControllerService;
-import org.apache.hyracks.control.nc.NodeControllerService;
public class ResourceIdRequestResponseMessage implements IApplicationMessage {
private static final long serialVersionUID = 1L;
@@ -49,10 +48,8 @@ public class ResourceIdRequestResponseMessage implements IApplicationMessage {
@Override
public void handle(IControllerService cs) throws HyracksDataException, InterruptedException {
- NodeControllerService ncs = (NodeControllerService) cs;
- IAppRuntimeContext asterixNcAppRuntimeCtx =
- (IAppRuntimeContext) ncs.getApplicationContext().getApplicationObject();
- ((GlobalResourceIdFactory) asterixNcAppRuntimeCtx.getResourceIdFactory()).addNewIds(this);
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) cs.getApplicationContext();
+ ((GlobalResourceIdFactory) appCtx.getResourceIdFactory()).addNewIds(this);
}
@Override
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index 037945a..704ee52 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -154,10 +154,10 @@ public class LSMPrimaryUpsertOperatorNodePushable extends LSMIndexInsertUpdateDe
indexAccessor = index.createAccessor(modCallback, searchCallback);
cursor = indexAccessor.createSearchCursor(false);
frameTuple = new FrameTupleReference();
- IAppRuntimeContext runtimeCtx =
- (IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject();
+ IAppRuntimeContext appCtx =
+ (IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext();
LSMIndexUtil.checkAndSetFirstLSN((AbstractLSMIndex) index,
- runtimeCtx.getTransactionSubsystem().getLogManager());
+ appCtx.getTransactionSubsystem().getLogManager());
frameOpCallback =
frameOpCallbackFactory.createFrameOperationCallback(ctx, (ILSMIndexAccessor) indexAccessor);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
index 69a2faf..ccb63ac 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
@@ -71,11 +71,11 @@ public class FlushDatasetOperatorDescriptor extends AbstractSingleActivityOperat
@Override
public void close() throws HyracksDataException {
try {
- IAppRuntimeContext runtimeCtx = (IAppRuntimeContext) ctx.getJobletContext()
- .getApplicationContext().getApplicationObject();
- IDatasetLifecycleManager datasetLifeCycleManager = runtimeCtx.getDatasetLifecycleManager();
- ILockManager lockManager = runtimeCtx.getTransactionSubsystem().getLockManager();
- ITransactionManager txnManager = runtimeCtx.getTransactionSubsystem().getTransactionManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) ctx.getJobletContext()
+ .getServiceContext().getApplicationContext();
+ IDatasetLifecycleManager datasetLifeCycleManager = appCtx.getDatasetLifecycleManager();
+ ILockManager lockManager = appCtx.getTransactionSubsystem().getLockManager();
+ ITransactionManager txnManager = appCtx.getTransactionSubsystem().getTransactionManager();
// get the local transaction
ITransactionContext txnCtx = txnManager.getTransactionContext(jobId, false);
// lock the dataset granule
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactory.java
index a8b61f7..b835b3a 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactory.java
@@ -23,9 +23,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.apache.asterix.common.messaging.api.INCMessageBroker;
import org.apache.asterix.runtime.message.ResourceIdRequestMessage;
import org.apache.asterix.runtime.message.ResourceIdRequestResponseMessage;
-import org.apache.hyracks.api.application.IApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.storage.common.file.IResourceIdFactory;
/**
@@ -34,14 +33,14 @@ import org.apache.hyracks.storage.common.file.IResourceIdFactory;
*/
public class GlobalResourceIdFactory implements IResourceIdFactory {
- private final IApplicationContext appCtx;
+ private final INCServiceContext serviceCtx;
private final LinkedBlockingQueue<ResourceIdRequestResponseMessage> resourceIdResponseQ;
private final String nodeId;
- public GlobalResourceIdFactory(IApplicationContext appCtx) {
- this.appCtx = appCtx;
+ public GlobalResourceIdFactory(INCServiceContext serviceCtx) {
+ this.serviceCtx = serviceCtx;
this.resourceIdResponseQ = new LinkedBlockingQueue<>();
- this.nodeId = ((NodeControllerService) appCtx.getControllerService()).getApplicationContext().getNodeId();
+ this.nodeId = serviceCtx.getNodeId();
}
public void addNewIds(ResourceIdRequestResponseMessage resourceIdResponse) throws InterruptedException {
@@ -63,7 +62,7 @@ public class GlobalResourceIdFactory implements IResourceIdFactory {
//if no response available or it has an exception, request a new one
if (reponse == null || reponse.getException() != null) {
ResourceIdRequestMessage msg = new ResourceIdRequestMessage(nodeId);
- ((INCMessageBroker) appCtx.getMessageBroker()).sendMessageToCC(msg);
+ ((INCMessageBroker) serviceCtx.getMessageBroker()).sendMessageToCC(msg);
reponse = resourceIdResponseQ.take();
if (reponse.getException() != null) {
throw new HyracksDataException(reponse.getException().getMessage());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactoryProvider.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactoryProvider.java
index 9027f75..d99ea90 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactoryProvider.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/transaction/GlobalResourceIdFactoryProvider.java
@@ -18,17 +18,17 @@
*/
package org.apache.asterix.runtime.transaction;
-import org.apache.hyracks.api.application.IApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
public class GlobalResourceIdFactoryProvider {
- private final IApplicationContext appCtx;
+ private final INCServiceContext ncServiceCtx;
- public GlobalResourceIdFactoryProvider(IApplicationContext appCtx) {
- this.appCtx = appCtx;
+ public GlobalResourceIdFactoryProvider(INCServiceContext ncServiceCtx) {
+ this.ncServiceCtx = ncServiceCtx;
}
public GlobalResourceIdFactory createResourceIdFactory() {
- return new GlobalResourceIdFactory(appCtx);
+ return new GlobalResourceIdFactory(ncServiceCtx);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/AppContextInfo.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/AppContextInfo.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/AppContextInfo.java
index 400bb5a..4185b26 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/AppContextInfo.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/AppContextInfo.java
@@ -42,7 +42,7 @@ import org.apache.asterix.common.library.ILibraryManager;
import org.apache.asterix.common.metadata.IMetadataBootstrap;
import org.apache.asterix.common.replication.IFaultToleranceStrategy;
import org.apache.asterix.common.transactions.IResourceIdManager;
-import org.apache.hyracks.api.application.ICCApplicationContext;
+import org.apache.hyracks.api.application.ICCServiceContext;
import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.storage.am.common.api.IIndexLifecycleManagerProvider;
import org.apache.hyracks.storage.common.IStorageManager;
@@ -55,7 +55,7 @@ import org.apache.hyracks.storage.common.IStorageManager;
public class AppContextInfo implements IApplicationContextInfo, IPropertiesProvider {
public static final AppContextInfo INSTANCE = new AppContextInfo();
- private ICCApplicationContext appCtx;
+ private ICCServiceContext ccServiceCtx;
private IGlobalRecoveryManager globalRecoveryManager;
private ILibraryManager libraryManager;
private IResourceIdManager resourceIdManager;
@@ -79,7 +79,7 @@ public class AppContextInfo implements IApplicationContextInfo, IPropertiesProvi
private AppContextInfo() {
}
- public static synchronized void initialize(ICCApplicationContext ccAppCtx, IHyracksClientConnection hcc,
+ public static synchronized void initialize(ICCServiceContext ccServiceCtx, IHyracksClientConnection hcc,
ILibraryManager libraryManager, IResourceIdManager resourceIdManager,
Supplier<IMetadataBootstrap> metadataBootstrapSupplier, IGlobalRecoveryManager globalRecoveryManager,
IFaultToleranceStrategy ftStrategy)
@@ -88,13 +88,13 @@ public class AppContextInfo implements IApplicationContextInfo, IPropertiesProvi
throw new AsterixException(AppContextInfo.class.getSimpleName() + " has been initialized already");
}
INSTANCE.initialized = true;
- INSTANCE.appCtx = ccAppCtx;
+ INSTANCE.ccServiceCtx = ccServiceCtx;
INSTANCE.hcc = hcc;
INSTANCE.libraryManager = libraryManager;
INSTANCE.resourceIdManager = resourceIdManager;
// Determine whether to use old-style asterix-configuration.xml or new-style configuration.
// QQQ strip this out eventually
- PropertiesAccessor propertiesAccessor = PropertiesAccessor.getInstance(ccAppCtx.getAppConfig());
+ PropertiesAccessor propertiesAccessor = PropertiesAccessor.getInstance(ccServiceCtx.getAppConfig());
INSTANCE.compilerProperties = new CompilerProperties(propertiesAccessor);
INSTANCE.externalProperties = new ExternalProperties(propertiesAccessor);
INSTANCE.metadataProperties = new MetadataProperties(propertiesAccessor);
@@ -120,8 +120,8 @@ public class AppContextInfo implements IApplicationContextInfo, IPropertiesProvi
}
@Override
- public ICCApplicationContext getCCApplicationContext() {
- return appCtx;
+ public ICCServiceContext getCCServiceContext() {
+ return ccServiceCtx;
}
@Override
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 49cbc54..f65979f 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -79,7 +79,7 @@ public class ClusterStateManager implements IClusterStateManager {
private ClusterStateManager() {
cluster = ClusterProperties.INSTANCE.getCluster();
// if this is the CC process
- if (AppContextInfo.INSTANCE.initialized() && AppContextInfo.INSTANCE.getCCApplicationContext() != null) {
+ if (AppContextInfo.INSTANCE.initialized() && AppContextInfo.INSTANCE.getCCServiceContext() != null) {
node2PartitionsMap = AppContextInfo.INSTANCE.getMetadataProperties().getNodePartitions();
clusterPartitions = AppContextInfo.INSTANCE.getMetadataProperties().getClusterPartitions();
currentMetadataNode = AppContextInfo.INSTANCE.getMetadataProperties().getMetadataNodeName();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeComponentsProvider.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeComponentsProvider.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeComponentsProvider.java
index 117fa9e..387e949 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeComponentsProvider.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeComponentsProvider.java
@@ -42,37 +42,37 @@ public class RuntimeComponentsProvider implements IIndexLifecycleManagerProvider
@Override
public ILSMIOOperationScheduler getIOScheduler(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getLSMIOScheduler();
}
@Override
public IBufferCache getBufferCache(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getBufferCache();
}
@Override
public IFileMapProvider getFileMapProvider(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getFileMapManager();
}
@Override
public ILocalResourceRepository getLocalResourceRepository(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getLocalResourceRepository();
}
@Override
public IDatasetLifecycleManager getLifecycleManager(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getDatasetLifecycleManager();
}
@Override
public IResourceIdFactory getResourceIdFactory(IHyracksTaskContext ctx) {
- return ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext().getApplicationObject())
+ return ((IAppRuntimeContext) ctx.getJobletContext().getServiceContext().getApplicationContext())
.getResourceIdFactory();
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeUtils.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeUtils.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeUtils.java
index 8e3f989..a2a191d 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeUtils.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RuntimeUtils.java
@@ -53,13 +53,13 @@ public class RuntimeUtils {
public static Map<InetAddress, Set<String>> getNodeControllerMap() throws HyracksDataException {
Map<InetAddress, Set<String>> map = new HashMap<>();
- AppContextInfo.INSTANCE.getCCApplicationContext().getCCContext().getIPAddressNodeMap(map);
+ AppContextInfo.INSTANCE.getCCServiceContext().getCCContext().getIPAddressNodeMap(map);
return map;
}
public static void getNodeControllerMap(Map<InetAddress, Set<String>> map) {
ClusterControllerService ccs =
- (ClusterControllerService) AppContextInfo.INSTANCE.getCCApplicationContext().getControllerService();
+ (ClusterControllerService) AppContextInfo.INSTANCE.getCCServiceContext().getControllerService();
INodeManager nodeManager = ccs.getNodeManager();
map.putAll(nodeManager.getIpAddressNodeNameMap());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index eef2f35..3a2fbe1 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -240,7 +240,7 @@
<mainClass>org.apache.hyracks.control.cc.CCDriver</mainClass>
<commandLineArguments>
<commandLineArgument>-app-class</commandLineArgument>
- <commandLineArgument>org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint</commandLineArgument>
+ <commandLineArgument>org.apache.asterix.hyracks.bootstrap.CCApplication</commandLineArgument>
</commandLineArguments>
</program>
<program>
@@ -251,7 +251,7 @@
<mainClass>org.apache.hyracks.control.nc.NCDriver</mainClass>
<commandLineArguments>
<commandLineArgument>-app-class</commandLineArgument>
- <commandLineArgument>org.apache.asterix.hyracks.bootstrap.NCApplicationEntryPoint</commandLineArgument>
+ <commandLineArgument>org.apache.asterix.hyracks.bootstrap.NCApplication</commandLineArgument>
</commandLineArguments>
</program>
<program>
@@ -271,7 +271,7 @@
</platforms>
<commandLineArguments>
<commandLineArgument>-app-class</commandLineArgument>
- <commandLineArgument>org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint</commandLineArgument>
+ <commandLineArgument>org.apache.asterix.hyracks.bootstrap.CCApplication</commandLineArgument>
</commandLineArguments>
</daemon>
<daemon>
@@ -282,7 +282,7 @@
</platforms>
<commandLineArguments>
<commandLineArgument>-app-class</commandLineArgument>
- <commandLineArgument>org.apache.asterix.hyracks.bootstrap.NCApplicationEntryPoint</commandLineArgument>
+ <commandLineArgument>org.apache.asterix.hyracks.bootstrap.NCApplication</commandLineArgument>
</commandLineArguments>
</daemon>
<daemon>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
index cc87be4..72d28b9 100644
--- a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
+++ b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
@@ -31,11 +31,11 @@ iodevices=../asterix-server/target/tmp/asterix_nc2/iodevice1,../asterix-server/t
[nc]
address=127.0.0.1
command=asterixnc
-app.class=org.apache.asterix.hyracks.bootstrap.NCApplicationEntryPoint
+app.class=org.apache.asterix.hyracks.bootstrap.NCApplication
jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory"
storage.subdir=test_storage
storage.memorycomponent.globalbudget = 1073741824
[cc]
address = 127.0.0.1
-app.class=org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint
+app.class=org.apache.asterix.hyracks.bootstrap.CCApplication
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexOperationTrackerFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexOperationTrackerFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexOperationTrackerFactory.java
index 4e12f96..c553bc0 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexOperationTrackerFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexOperationTrackerFactory.java
@@ -21,7 +21,7 @@ package org.apache.asterix.transaction.management.opcallbacks;
import org.apache.asterix.common.api.IAppRuntimeContext;
import org.apache.asterix.common.api.IDatasetLifecycleManager;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerFactory;
@@ -36,9 +36,9 @@ public class PrimaryIndexOperationTrackerFactory implements ILSMOperationTracker
}
@Override
- public ILSMOperationTracker getOperationTracker(INCApplicationContext ctx) {
- IDatasetLifecycleManager dslcManager = ((IAppRuntimeContext) ctx.getApplicationObject())
- .getDatasetLifecycleManager();
+ public ILSMOperationTracker getOperationTracker(INCServiceContext ctx) {
+ IDatasetLifecycleManager dslcManager =
+ ((IAppRuntimeContext) ctx.getApplicationContext()).getDatasetLifecycleManager();
return dslcManager.getOperationTracker(datasetID);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexOperationTrackerFactory.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexOperationTrackerFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexOperationTrackerFactory.java
index be98704..4832acd 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexOperationTrackerFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexOperationTrackerFactory.java
@@ -21,7 +21,7 @@ package org.apache.asterix.transaction.management.opcallbacks;
import org.apache.asterix.common.api.IAppRuntimeContext;
import org.apache.asterix.common.api.IDatasetLifecycleManager;
import org.apache.asterix.common.context.BaseOperationTracker;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerFactory;
@@ -36,9 +36,9 @@ public class SecondaryIndexOperationTrackerFactory implements ILSMOperationTrack
}
@Override
- public ILSMOperationTracker getOperationTracker(INCApplicationContext ctx) {
- IDatasetLifecycleManager dslcManager = ((IAppRuntimeContext) ctx.getApplicationObject())
- .getDatasetLifecycleManager();
+ public ILSMOperationTracker getOperationTracker(INCServiceContext ctx) {
+ IDatasetLifecycleManager dslcManager =
+ ((IAppRuntimeContext) ctx.getApplicationContext()).getDatasetLifecycleManager();
return new BaseOperationTracker(datasetID, dslcManager.getDatasetInfo(datasetID));
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java
index 06ca8e6..d10a9a9 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java
@@ -21,7 +21,7 @@ package org.apache.asterix.transaction.management.resource;
import java.util.Map;
import org.apache.asterix.common.api.IAppRuntimeContext;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -50,17 +50,17 @@ public class ExternalBTreeLocalResourceMetadata extends LSMBTreeLocalResourceMet
}
@Override
- public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource)
+ public ILSMIndex createIndexInstance(INCServiceContext serviceCtx, LocalResource resource)
throws HyracksDataException {
- IAppRuntimeContext runtimeContextProvider = (IAppRuntimeContext) appCtx.getApplicationObject();
- IIOManager ioManager = runtimeContextProvider.getIOManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) serviceCtx.getApplicationContext();
+ IIOManager ioManager = appCtx.getIOManager();
FileReference file = ioManager.resolve(resource.getPath());
- return LSMBTreeUtil.createExternalBTree(ioManager, file, runtimeContextProvider.getBufferCache(),
- runtimeContextProvider.getFileMapManager(), typeTraits, cmpFactories, bloomFilterKeyFields,
- runtimeContextProvider.getBloomFilterFalsePositiveRate(),
+ return LSMBTreeUtil.createExternalBTree(ioManager, file, appCtx.getBufferCache(),
+ appCtx.getFileMapManager(), typeTraits, cmpFactories, bloomFilterKeyFields,
+ appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties,
- runtimeContextProvider.getDatasetLifecycleManager()),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(),
+ appCtx.getDatasetLifecycleManager()),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), -1, true, metadataPageManagerFactory);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java
index 1a080b2..fd7ff0f 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.asterix.common.api.IAppRuntimeContext;
import org.apache.asterix.common.transactions.Resource;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -65,17 +65,17 @@ public class ExternalBTreeWithBuddyLocalResourceMetadata extends Resource {
}
@Override
- public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource)
+ public ILSMIndex createIndexInstance(INCServiceContext serviceCtx, LocalResource resource)
throws HyracksDataException {
- IAppRuntimeContext appRuntimeCtx = (IAppRuntimeContext) appCtx.getApplicationObject();
- IIOManager ioManager = appCtx.getIoManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) serviceCtx.getApplicationContext();
+ IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(resource.getPath());
- return LSMBTreeUtil.createExternalBTreeWithBuddy(ioManager, file, appRuntimeCtx.getBufferCache(),
- appRuntimeCtx.getFileMapManager(), typeTraits, btreeCmpFactories,
- appRuntimeCtx.getBloomFilterFalsePositiveRate(),
+ return LSMBTreeUtil.createExternalBTreeWithBuddy(ioManager, file, appCtx.getBufferCache(),
+ appCtx.getFileMapManager(), typeTraits, btreeCmpFactories,
+ appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties,
- appRuntimeCtx.getDatasetLifecycleManager()),
- opTrackerProvider.getOperationTracker(appCtx), appRuntimeCtx.getLSMIOScheduler(),
+ appCtx.getDatasetLifecycleManager()),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), buddyBtreeFields, -1, true, metadataPageManagerFactory);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java
index c923046..54cd97d 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java
@@ -21,7 +21,7 @@ package org.apache.asterix.transaction.management.resource;
import java.util.Map;
import org.apache.asterix.common.api.IAppRuntimeContext;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ILinearizeComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
@@ -59,18 +59,18 @@ public class ExternalRTreeLocalResourceMetadata extends LSMRTreeLocalResourceMet
}
@Override
- public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource)
+ public ILSMIndex createIndexInstance(INCServiceContext serviceCtx, LocalResource resource)
throws HyracksDataException {
- IAppRuntimeContext runtimeContextProvider = (IAppRuntimeContext) appCtx.getApplicationObject();
- IIOManager ioManager = runtimeContextProvider.getIOManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) serviceCtx.getApplicationContext();
+ IIOManager ioManager = appCtx.getIOManager();
FileReference file = ioManager.resolve(resource.getPath());
try {
- return LSMRTreeUtils.createExternalRTree(ioManager, file, runtimeContextProvider.getBufferCache(),
- runtimeContextProvider.getFileMapManager(), typeTraits, rtreeCmpFactories, btreeCmpFactories,
- valueProviderFactories, rtreePolicyType, runtimeContextProvider.getBloomFilterFalsePositiveRate(),
+ return LSMRTreeUtils.createExternalRTree(ioManager, file, appCtx.getBufferCache(),
+ appCtx.getFileMapManager(), typeTraits, rtreeCmpFactories, btreeCmpFactories,
+ valueProviderFactories, rtreePolicyType, appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties,
- runtimeContextProvider.getDatasetLifecycleManager()),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(),
+ appCtx.getDatasetLifecycleManager()),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), linearizeCmpFactory, btreeFields, -1, true, isPointMBR,
metadataPageManagerFactory);
} catch (TreeIndexException e) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
index f38711c..0776567 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.asterix.common.api.IAppRuntimeContext;
import org.apache.asterix.common.api.IDatasetLifecycleManager;
import org.apache.asterix.common.transactions.Resource;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -75,19 +75,19 @@ public class LSMBTreeLocalResourceMetadata extends Resource {
}
@Override
- public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource)
+ public ILSMIndex createIndexInstance(INCServiceContext serviceCtx, LocalResource resource)
throws HyracksDataException {
- IAppRuntimeContext appRuntimeCtx = (IAppRuntimeContext) appCtx.getApplicationObject();
- IIOManager ioManager = appRuntimeCtx.getIOManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) serviceCtx.getApplicationContext();
+ IIOManager ioManager = appCtx.getIOManager();
FileReference file = ioManager.resolve(resource.getPath());
int ioDeviceNum = Resource.getIoDeviceNum(ioManager, file.getDeviceHandle());
- final IDatasetLifecycleManager datasetLifecycleManager = appRuntimeCtx.getDatasetLifecycleManager();
+ final IDatasetLifecycleManager datasetLifecycleManager = appCtx.getDatasetLifecycleManager();
return LSMBTreeUtil.createLSMTree(ioManager,
datasetLifecycleManager.getVirtualBufferCaches(datasetId(), ioDeviceNum), file,
- appRuntimeCtx.getBufferCache(), appRuntimeCtx.getFileMapManager(), typeTraits, cmpFactories,
- bloomFilterKeyFields, appRuntimeCtx.getBloomFilterFalsePositiveRate(),
+ appCtx.getBufferCache(), appCtx.getFileMapManager(), typeTraits, cmpFactories,
+ bloomFilterKeyFields, appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties, datasetLifecycleManager),
- opTrackerProvider.getOperationTracker(appCtx), appRuntimeCtx.getLSMIOScheduler(),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), isPrimary, filterTypeTraits, filterCmpFactories, btreeFields,
filterFields, true, metadataPageManagerFactory);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/953eb966/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
index acb087a..a682f5a 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.asterix.common.api.IAppRuntimeContext;
import org.apache.asterix.common.transactions.Resource;
-import org.apache.hyracks.api.application.INCApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -81,34 +81,34 @@ public class LSMInvertedIndexLocalResourceMetadata extends Resource {
}
@Override
- public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource)
+ public ILSMIndex createIndexInstance(INCServiceContext serviceCtx, LocalResource resource)
throws HyracksDataException {
- IAppRuntimeContext runtimeContextProvider = (IAppRuntimeContext) appCtx.getApplicationObject();
- IIOManager ioManager = runtimeContextProvider.getIOManager();
+ IAppRuntimeContext appCtx = (IAppRuntimeContext) serviceCtx.getApplicationContext();
+ IIOManager ioManager = appCtx.getIOManager();
FileReference file = ioManager.resolve(resource.getPath());
int ioDeviceNum = Resource.getIoDeviceNum(ioManager, file.getDeviceHandle());
List<IVirtualBufferCache> virtualBufferCaches =
- runtimeContextProvider.getDatasetLifecycleManager().getVirtualBufferCaches(datasetId(), ioDeviceNum);
+ appCtx.getDatasetLifecycleManager().getVirtualBufferCaches(datasetId(), ioDeviceNum);
try {
if (isPartitioned) {
return InvertedIndexUtils.createPartitionedLSMInvertedIndex(ioManager, virtualBufferCaches,
- runtimeContextProvider.getFileMapManager(), invListTypeTraits, invListCmpFactories,
- tokenTypeTraits, tokenCmpFactories, tokenizerFactory, runtimeContextProvider.getBufferCache(),
- file.getAbsolutePath(), runtimeContextProvider.getBloomFilterFalsePositiveRate(),
+ appCtx.getFileMapManager(), invListTypeTraits, invListCmpFactories,
+ tokenTypeTraits, tokenCmpFactories, tokenizerFactory, appCtx.getBufferCache(),
+ file.getAbsolutePath(), appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties,
- runtimeContextProvider.getDatasetLifecycleManager()),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(),
+ appCtx.getDatasetLifecycleManager()),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), invertedIndexFields, filterTypeTraits,
filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps,
invertedIndexFieldsForNonBulkLoadOps, true, metadataPageManagerFactory);
} else {
return InvertedIndexUtils.createLSMInvertedIndex(ioManager, virtualBufferCaches,
- runtimeContextProvider.getFileMapManager(), invListTypeTraits, invListCmpFactories,
- tokenTypeTraits, tokenCmpFactories, tokenizerFactory, runtimeContextProvider.getBufferCache(),
- file.getAbsolutePath(), runtimeContextProvider.getBloomFilterFalsePositiveRate(),
+ appCtx.getFileMapManager(), invListTypeTraits, invListCmpFactories,
+ tokenTypeTraits, tokenCmpFactories, tokenizerFactory, appCtx.getBufferCache(),
+ file.getAbsolutePath(), appCtx.getBloomFilterFalsePositiveRate(),
mergePolicyFactory.createMergePolicy(mergePolicyProperties,
- runtimeContextProvider.getDatasetLifecycleManager()),
- opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(),
+ appCtx.getDatasetLifecycleManager()),
+ opTrackerProvider.getOperationTracker(serviceCtx), appCtx.getLSMIOScheduler(),
ioOpCallbackFactory.createIoOpCallback(), invertedIndexFields, filterTypeTraits,
filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps,
invertedIndexFieldsForNonBulkLoadOps, true, metadataPageManagerFactory);