Murtadha Hubail has submitted this change and it was merged. Change subject: [NO ISSUE][OTR] Clean up INcApplicationContext ......................................................................
[NO ISSUE][OTR] Clean up INcApplicationContext Change-Id: Ide17ab0ea7553a6e8e22487b52ba0af379431f81 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2372 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java 3 files changed, 4 insertions(+), 18 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Michael Blow: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java index 6e25856..3780078 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java @@ -306,11 +306,6 @@ } @Override - public double getBloomFilterFalsePositiveRate() { - return storageProperties.getBloomFilterFalsePositiveRate(); - } - - @Override public ILSMIOOperationScheduler getLSMIOScheduler() { return lsmIOScheduler; } @@ -373,11 +368,6 @@ @Override public NodeProperties getNodeProperties() { return nodeProperties; - } - - @Override - public ILSMOperationTracker getPrimaryOperationTracker(int datasetID, int partition) { - return datasetLifecycleManager.getOperationTracker(datasetID, partition); } @Override diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java index 19b4d61..9eb6259 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java @@ -23,7 +23,6 @@ import java.util.concurrent.Executor; import org.apache.asterix.common.context.IStorageComponentProvider; -import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.replication.IReplicationChannel; import org.apache.asterix.common.replication.IReplicationManager; import org.apache.asterix.common.storage.IIndexCheckpointManagerProvider; @@ -36,7 +35,6 @@ import org.apache.hyracks.api.io.IIOManager; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; import org.apache.hyracks.storage.common.ILocalResourceRepository; import org.apache.hyracks.storage.common.buffercache.IBufferCache; import org.apache.hyracks.storage.common.file.IResourceIdFactory; @@ -67,15 +65,11 @@ IResourceIdFactory getResourceIdFactory(); - ILSMOperationTracker getPrimaryOperationTracker(int datasetID, int partition); - - void initialize(boolean initialRun) throws IOException, ACIDException, AlgebricksException; + void initialize(boolean initialRun) throws IOException, AlgebricksException; void setShuttingdown(boolean b); void deinitialize() throws HyracksDataException; - - double getBloomFilterFalsePositiveRate(); Object getActiveManager(); 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 23806bd..7d5558d 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 @@ -334,13 +334,15 @@ new LSMBTreeIOOperationCallbackFactory(idGeneratorProvider); IStorageComponentProvider storageComponentProvider = appContext.getStorageComponentProvider(); if (isNewUniverse()) { + final double bloomFilterFalsePositiveRate = + appContext.getStorageProperties().getBloomFilterFalsePositiveRate(); LSMBTreeLocalResourceFactory lsmBtreeFactory = new LSMBTreeLocalResourceFactory( storageComponentProvider.getStorageManager(), typeTraits, cmpFactories, null, null, null, opTrackerFactory, ioOpCallbackFactory, storageComponentProvider.getMetadataPageManagerFactory(), new AsterixVirtualBufferCacheProvider(datasetId), storageComponentProvider.getIoOperationSchedulerProvider(), appContext.getMetadataMergePolicyFactory(), GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, true, - bloomFilterKeyFields, appContext.getBloomFilterFalsePositiveRate(), true, null); + bloomFilterKeyFields, bloomFilterFalsePositiveRate, true, null); DatasetLocalResourceFactory dsLocalResourceFactory = new DatasetLocalResourceFactory(datasetId, lsmBtreeFactory); // TODO(amoudi) Creating the index should be done through the same code path as -- To view, visit https://asterix-gerrit.ics.uci.edu/2372 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ide17ab0ea7553a6e8e22487b52ba0af379431f81 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org> Gerrit-Reviewer: abdullah alamoudi <bamou...@gmail.com>
