You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/02/09 13:19:25 UTC
asterixdb git commit: [NO ISSUE][OTR] Clean up INcApplicationContext
Repository: asterixdb
Updated Branches:
refs/heads/master cd53e8851 -> 841b8124b
[NO ISSUE][OTR] Clean up INcApplicationContext
Change-Id: Ide17ab0ea7553a6e8e22487b52ba0af379431f81
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2372
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/841b8124
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/841b8124
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/841b8124
Branch: refs/heads/master
Commit: 841b8124bdff7951f9202b5b753bfc5c95dc9c6f
Parents: cd53e88
Author: Murtadha Hubail <mh...@apache.org>
Authored: Fri Feb 9 00:56:55 2018 +0300
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Fri Feb 9 05:18:50 2018 -0800
----------------------------------------------------------------------
.../org/apache/asterix/app/nc/NCAppRuntimeContext.java | 10 ----------
.../apache/asterix/common/api/INcApplicationContext.java | 8 +-------
.../asterix/metadata/bootstrap/MetadataBootstrap.java | 4 +++-
3 files changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/841b8124/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
----------------------------------------------------------------------
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 @@ public class NCAppRuntimeContext implements INcApplicationContext {
}
@Override
- public double getBloomFilterFalsePositiveRate() {
- return storageProperties.getBloomFilterFalsePositiveRate();
- }
-
- @Override
public ILSMIOOperationScheduler getLSMIOScheduler() {
return lsmIOScheduler;
}
@@ -376,11 +371,6 @@ public class NCAppRuntimeContext implements INcApplicationContext {
}
@Override
- public ILSMOperationTracker getPrimaryOperationTracker(int datasetID, int partition) {
- return datasetLifecycleManager.getOperationTracker(datasetID, partition);
- }
-
- @Override
public ExecutorService getThreadExecutor() {
return threadExecutor;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/841b8124/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
----------------------------------------------------------------------
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.rmi.RemoteException;
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.exceptions.HyracksDataException;
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,16 +65,12 @@ public interface INcApplicationContext extends IApplicationContext {
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();
IReplicationManager getReplicationManager();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/841b8124/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 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 @@ public class MetadataBootstrap {
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