abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1758
Change subject: Change DataflowHelperFactory not to require Task Context
......................................................................
Change DataflowHelperFactory not to require Task Context
Change-Id: I9dcd95dbefca131c4bbdb43306f00f6f8ea60800
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/AbstractExternalDatasetIndexesOperatorDescriptor.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexCreateOperatorDescriptor.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexModificationOperatorDescriptor.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalLookupOperatorDescriptor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IIndexDataflowHelperFactory.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelperFactory.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexStatsOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
14 files changed, 23 insertions(+), 19 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/58/1758/1
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
index 856638f..4df8fe2 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
@@ -447,7 +447,8 @@
public IndexDataflowHelperFactory
getPrimaryIndexDataflowHelperFactory(PrimaryIndexInfo primaryIndexInfo,
IStorageComponentProvider storageComponentProvider) throws
AlgebricksException {
- return new
IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(),
primaryIndexInfo.fileSplitProvider);
+ return new
IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(),
+ primaryIndexInfo.fileSplitProvider);
}
public IIndexDataflowHelper getPrimaryIndexDataflowHelper(Dataset dataset,
IAType[] primaryKeyTypes,
@@ -459,6 +460,6 @@
mergePolicyFactory, mergePolicyProperties, filterFields,
primaryKeyIndexes, primaryKeyIndicators,
storageComponentProvider);
return getPrimaryIndexDataflowHelperFactory(primaryIndexInfo,
storageComponentProvider)
- .create(createTestContext(true), PARTITION);
+
.create(createTestContext(true).getJobletContext().getServiceContext(),
PARTITION);
}
}
\ No newline at end of file
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/AbstractExternalDatasetIndexesOperatorDescriptor.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/AbstractExternalDatasetIndexesOperatorDescriptor.java
index 95debe3..8d83b9a 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/AbstractExternalDatasetIndexesOperatorDescriptor.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/AbstractExternalDatasetIndexesOperatorDescriptor.java
@@ -63,8 +63,8 @@
try {
// perform operation on btrees
for (int i = 0; i <
treeIndexesDataflowHelperFactories.size(); i++) {
- IIndexDataflowHelper indexHelper =
-
treeIndexesDataflowHelperFactories.get(i).create(ctx, partition);
+ IIndexDataflowHelper indexHelper =
treeIndexesDataflowHelperFactories.get(i)
+
.create(ctx.getJobletContext().getServiceContext(), partition);
performOpOnIndex(indexHelper, ctx);
}
} catch (Exception e) {
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexCreateOperatorDescriptor.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexCreateOperatorDescriptor.java
index 09a3c47..79dc396 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexCreateOperatorDescriptor.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexCreateOperatorDescriptor.java
@@ -66,7 +66,8 @@
@Override
public void initialize() throws HyracksDataException {
IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx,
partition);
- IIndexDataflowHelper indexHelper =
dataflowHelperFactory.create(ctx, partition);
+ IIndexDataflowHelper indexHelper =
+
dataflowHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
FileIndexTupleTranslator filesTupleTranslator = new
FileIndexTupleTranslator();
// Build the index
indexBuilder.build();
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexModificationOperatorDescriptor.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexModificationOperatorDescriptor.java
index f4fb455..d7bd393 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexModificationOperatorDescriptor.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalFilesIndexModificationOperatorDescriptor.java
@@ -62,7 +62,8 @@
return new AbstractOperatorNodePushable() {
@Override
public void initialize() throws HyracksDataException {
- final IIndexDataflowHelper indexHelper =
dataflowHelperFactory.create(ctx, partition);
+ final IIndexDataflowHelper indexHelper =
+
dataflowHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
FileIndexTupleTranslator filesTupleTranslator = new
FileIndexTupleTranslator();
// Open and get
indexHelper.open();
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalLookupOperatorDescriptor.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalLookupOperatorDescriptor.java
index 20744bc..6299982 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalLookupOperatorDescriptor.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/ExternalLookupOperatorDescriptor.java
@@ -61,7 +61,8 @@
throws HyracksDataException {
// Create a file index accessor to be used for files lookup operations
final ExternalFileIndexAccessor snapshotAccessor = new
ExternalFileIndexAccessor(
- dataflowHelperFactory.create(ctx, partition),
searchOpCallbackFactory, version);
+
dataflowHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition),
+ searchOpCallbackFactory, version);
return new AbstractUnaryInputUnaryOutputOperatorNodePushable() {
// The adapter that uses the file index along with the coming
tuples to access files in HDFS
private LookupAdapter<?> adapter;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IIndexDataflowHelperFactory.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IIndexDataflowHelperFactory.java
index 77d45f8..12065d6 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IIndexDataflowHelperFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IIndexDataflowHelperFactory.java
@@ -21,11 +21,11 @@
import java.io.Serializable;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
@FunctionalInterface
public interface IIndexDataflowHelperFactory extends Serializable {
- IIndexDataflowHelper create(final IHyracksTaskContext ctx, int partition)
throws HyracksDataException;
+ IIndexDataflowHelper create(final INCServiceContext ctx, int partition)
throws HyracksDataException;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
index 82fedb0..5fc07ad 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
@@ -48,7 +48,7 @@
IHyracksTaskContext ctx, int partition, int[] fieldPermutation,
float fillFactor, boolean verifyInput,
long numElementsHint, boolean checkIfEmptyIndex, RecordDescriptor
recDesc) throws HyracksDataException {
this.ctx = ctx;
- this.indexHelper = indexDataflowHelperFactory.create(ctx, partition);
+ this.indexHelper =
indexDataflowHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
this.fillFactor = fillFactor;
this.verifyInput = verifyInput;
this.numElementsHint = numElementsHint;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelperFactory.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelperFactory.java
index dd47154..4c811bd 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelperFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelperFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.hyracks.storage.am.common.dataflow;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.io.FileReference;
import org.apache.hyracks.api.io.FileSplit;
@@ -38,9 +38,9 @@
}
@Override
- public IIndexDataflowHelper create(IHyracksTaskContext ctx, int partition)
throws HyracksDataException {
+ public IIndexDataflowHelper create(INCServiceContext ctx, int partition)
throws HyracksDataException {
FileSplit fileSplit = fileSplitProvider.getFileSplits()[partition];
FileReference resourceRef =
fileSplit.getFileReference(ctx.getIoManager());
- return new
IndexDataflowHelper(ctx.getJobletContext().getServiceContext(), storageMgr,
resourceRef);
+ return new IndexDataflowHelper(ctx, storageMgr, resourceRef);
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
index f6073a4..fce31ca 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
@@ -31,7 +31,7 @@
public IndexDropOperatorNodePushable(IIndexDataflowHelperFactory
indexHelperFactory, IHyracksTaskContext ctx,
int partition) throws HyracksDataException {
- this.indexHelper = indexHelperFactory.create(ctx, partition);
+ this.indexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
index d41acdf..e80a837 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
@@ -63,7 +63,7 @@
IndexOperation op, IModificationOperationCallbackFactory
modOpCallbackFactory,
ITupleFilterFactory tupleFilterFactory) throws
HyracksDataException {
this.ctx = ctx;
- this.indexHelper = indexHelperFactory.create(ctx, partition);
+ this.indexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
this.modOpCallbackFactory = modOpCallbackFactory;
this.tupleFilterFactory = tupleFilterFactory;
this.inputRecDesc = inputRecDesc;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
index 509607c..933e724 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
@@ -85,7 +85,7 @@
ISearchOperationCallbackFactory searchCallbackFactory, boolean
appendIndexFilter)
throws HyracksDataException {
this.ctx = ctx;
- this.indexHelper = indexHelperFactory.create(ctx, partition);
+ this.indexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
this.retainInput = retainInput;
this.retainMissing = retainMissing;
this.appendIndexFilter = appendIndexFilter;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
index 6075c3d..bc7cb85 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
@@ -48,7 +48,7 @@
IIndexDataflowHelperFactory indexHelperFactory,
ISearchOperationCallbackFactory searchCallbackFactory)
throws HyracksDataException {
this.ctx = ctx;
- this.treeIndexHelper = indexHelperFactory.create(ctx, partition);
+ this.treeIndexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
this.searchCallbackFactory = searchCallbackFactory;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexStatsOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexStatsOperatorNodePushable.java
index 0210145..c00cecb 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexStatsOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexStatsOperatorNodePushable.java
@@ -49,7 +49,7 @@
IIndexDataflowHelperFactory indexHelperFactory, IStorageManager
storageManager)
throws HyracksDataException {
this.ctx = ctx;
- this.treeIndexHelper = indexHelperFactory.create(ctx, partition);
+ this.treeIndexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
this.storageManager = storageManager;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
index 5e4bc7d..5ff3308 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
@@ -35,7 +35,7 @@
public LSMIndexCompactOperatorNodePushable(IHyracksTaskContext ctx, int
partition,
IIndexDataflowHelperFactory indexHelperFactory) throws
HyracksDataException {
- this.indexHelper = indexHelperFactory.create(ctx, partition);
+ this.indexHelper =
indexHelperFactory.create(ctx.getJobletContext().getServiceContext(),
partition);
}
@Override
--
To view, visit https://asterix-gerrit.ics.uci.edu/1758
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dcd95dbefca131c4bbdb43306f00f6f8ea60800
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com>
