abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1567
Change subject: Rename Class Helper and cleanup ICCApplication interface
......................................................................
Rename Class Helper and cleanup ICCApplication interface
Change-Id: I2f6deb10ff240e85b26244b52c99776c0d1d3291
---
R
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationConfigurator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/application/ICCApplication.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java
5 files changed, 5 insertions(+), 16 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/67/1567/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationClassHelper.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationConfigurator.java
similarity index 95%
rename from
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationClassHelper.java
rename to
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationConfigurator.java
index e276be1..4a5371a 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationClassHelper.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ApplicationConfigurator.java
@@ -25,13 +25,12 @@
import org.apache.hyracks.control.common.controllers.NCConfig;
import org.apache.hyracks.util.file.FileUtil;
-class ApplicationClassHelper {
- private ApplicationClassHelper() {
+class ApplicationConfigurator {
+ private ApplicationConfigurator() {
}
static void registerConfigOptions(IConfigManager configManager) {
AsterixProperties.registerConfigOptions(configManager);
-
ControllerConfig.defaultDir =
FileUtil.joinPath(System.getProperty("java.io.tmpdir"), "asterixdb");
NCConfig.defaultAppClass = NCApplication.class.getName();
CCConfig.defaultAppClass = CCApplication.class.getName();
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index dadc2ae..c831508 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -304,7 +304,7 @@
@Override
public void registerConfig(IConfigManager configManager) {
super.registerConfig(configManager);
- ApplicationClassHelper.registerConfigOptions(configManager);
+ ApplicationConfigurator.registerConfigOptions(configManager);
}
public static synchronized void setAsterixStateProxy(IAsterixStateProxy
proxy) {
@@ -316,8 +316,7 @@
return AppContextInfo.INSTANCE;
}
- @Override
- public IHyracksClientConnection getHcc() throws Exception {
+ protected IHyracksClientConnection getHcc() throws Exception {
String strIP =
ccServiceCtx.getCCContext().getClusterControllerInfo().getClientNetAddress();
int port =
ccServiceCtx.getCCContext().getClusterControllerInfo().getClientNetPort();
return new HyracksConnection(strIP, port);
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
index 28e1f23..ce33cef 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
@@ -68,7 +68,7 @@
@Override
public void registerConfig(IConfigManager configManager) {
super.registerConfig(configManager);
- ApplicationClassHelper.registerConfigOptions(configManager);
+ ApplicationConfigurator.registerConfigOptions(configManager);
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/application/ICCApplication.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/application/ICCApplication.java
index b105d24..d4269d5 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/application/ICCApplication.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/application/ICCApplication.java
@@ -18,13 +18,10 @@
*/
package org.apache.hyracks.api.application;
-import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.api.job.resource.IJobCapacityController;
public interface ICCApplication extends IApplication {
IJobCapacityController getJobCapacityController();
-
- IHyracksClientConnection getHcc() throws Exception; //NOSONAR
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java
index ccdd493..8e423b8 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java
@@ -22,7 +22,6 @@
import org.apache.hyracks.api.application.ICCApplication;
import org.apache.hyracks.api.application.IServiceContext;
-import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.api.config.IConfigManager;
import org.apache.hyracks.api.config.Section;
import org.apache.hyracks.api.job.resource.DefaultJobCapacityController;
@@ -69,11 +68,6 @@
@Override
public Object getApplicationContext() {
- return null;
- }
-
- @Override
- public IHyracksClientConnection getHcc() throws Exception {
return null;
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1567
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f6deb10ff240e85b26244b52c99776c0d1d3291
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <[email protected]>
