Remove the job id parameter to fetch the dataset directory service info.
This is removed because, in contrast to our original plan we will not
have support for per job dataset directory service. There will be a single
directory service for all the jobs, i.e. for the whole hyracks instance.
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_result_distribution@2832 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
index ce6c2a3..2ab42c0 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
@@ -77,9 +77,8 @@
}
@Override
- public NetworkAddress getDatasetDirectoryServiceInfo(JobId jobId) throws Exception {
- HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction gddsf = new HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction(
- jobId);
+ public NetworkAddress getDatasetDirectoryServiceInfo() throws Exception {
+ HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction gddsf = new HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction();
return (NetworkAddress) rpci.call(ipcHandle, gddsf);
}
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksConnection.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksConnection.java
index 7a59880..e0fafb0 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksConnection.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/HyracksConnection.java
@@ -119,8 +119,8 @@
return hci.startJob(appName, JavaSerializationUtils.serialize(acggf), jobFlags);
}
- public NetworkAddress getDatasetDirectoryServiceInfo(JobId jobId) throws Exception {
- return hci.getDatasetDirectoryServiceInfo(jobId);
+ public NetworkAddress getDatasetDirectoryServiceInfo() throws Exception {
+ return hci.getDatasetDirectoryServiceInfo();
}
@Override
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientConnection.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientConnection.java
index 2938ed0..d65fd0a 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientConnection.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientConnection.java
@@ -103,8 +103,6 @@
/**
* Gets the IP Address and port for the DatasetDirectoryService wrapped in NetworkAddress
*
- * @param jobId
- * JobId of the Job
* @return {@link NetworkAddress}
* @throws Exception
*/
@@ -118,7 +116,7 @@
* JobId of the Job
* @throws Exception
*/
- public void waitForCompletion(JobId jobId) throws Exception;
+ public NetworkAddress getDatasetDirectoryServiceInfo() throws Exception;
/**
* Gets a map of node controller names to node information.
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientInterface.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientInterface.java
index 22e3a1c..22b0a8f 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientInterface.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/IHyracksClientInterface.java
@@ -36,7 +36,7 @@
public JobId startJob(String appName, byte[] acggfBytes, EnumSet<JobFlag> jobFlags) throws Exception;
- public NetworkAddress getDatasetDirectoryServiceInfo(JobId jobId) throws Exception;
+ public NetworkAddress getDatasetDirectoryServiceInfo() throws Exception;
public void waitForCompletion(JobId jobId) throws Exception;
diff --git a/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java b/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
index 4b61d09..1a19c7d 100644
--- a/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
+++ b/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
@@ -275,7 +275,7 @@
return clusterIPC;
}
- public NetworkAddress getDatasetDirectoryServiceInfo(JobId jobId) {
+ public NetworkAddress getDatasetDirectoryServiceInfo() {
return new NetworkAddress(ccConfig.clientNetIpAddress.getBytes(), ccConfig.clientNetPort);
}
@@ -341,9 +341,8 @@
}
case GET_DATASET_DIRECTORY_SERIVICE_INFO: {
- HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction gddsf = (HyracksClientInterfaceFunctions.GetDatasetDirectoryServiceInfoFunction) fn;
- workQueue.schedule(new GetDatasetDirectoryServiceInfoWork(ClusterControllerService.this, gddsf
- .getJobId(), new IPCResponder<NetworkAddress>(handle, mid)));
+ workQueue.schedule(new GetDatasetDirectoryServiceInfoWork(ClusterControllerService.this,
+ new IPCResponder<NetworkAddress>(handle, mid)));
return;
}
diff --git a/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetDatasetDirectoryServiceInfoWork.java b/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetDatasetDirectoryServiceInfoWork.java
index 720f31a..3ac6acc 100644
--- a/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetDatasetDirectoryServiceInfoWork.java
+++ b/hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetDatasetDirectoryServiceInfoWork.java
@@ -15,27 +15,24 @@
package edu.uci.ics.hyracks.control.cc.work;
import edu.uci.ics.hyracks.api.comm.NetworkAddress;
-import edu.uci.ics.hyracks.api.job.JobId;
import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
import edu.uci.ics.hyracks.control.common.work.IResultCallback;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
public class GetDatasetDirectoryServiceInfoWork extends SynchronizableWork {
private final ClusterControllerService ccs;
- private final JobId jobId;
+
private final IResultCallback<NetworkAddress> callback;
- public GetDatasetDirectoryServiceInfoWork(ClusterControllerService ccs, JobId jobId,
- IResultCallback<NetworkAddress> callback) {
+ public GetDatasetDirectoryServiceInfoWork(ClusterControllerService ccs, IResultCallback<NetworkAddress> callback) {
this.ccs = ccs;
- this.jobId = jobId;
this.callback = callback;
}
@Override
public void doRun() {
try {
- NetworkAddress addr = ccs.getDatasetDirectoryServiceInfo(jobId);
+ NetworkAddress addr = ccs.getDatasetDirectoryServiceInfo();
callback.setValue(addr);
} catch (Exception e) {
callback.setException(e);