support default plan paramter
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_staging@2161 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/base/IDriver.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/base/IDriver.java
index d7f8243..ccdd965 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/base/IDriver.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/base/IDriver.java
@@ -27,6 +27,8 @@
OUTER_JOIN_SINGLE_SORT
}
+ public void runJob(PregelixJob job, String ipAddress, int port) throws HyracksException;
+
public void runJob(PregelixJob job, Plan planChoice, String ipAddress, int port, boolean profiling)
throws HyracksException;
}
diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
index e8fdd68..0b99e71 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
@@ -64,6 +64,11 @@
}
@Override
+ public void runJob(PregelixJob job, String ipAddress, int port) throws HyracksException {
+ runJob(job, Plan.OUTER_JOIN, ipAddress, port, false);
+ }
+
+ @Override
public void runJob(PregelixJob job, Plan planChoice, String ipAddress, int port, boolean profiling)
throws HyracksException {
applicationName = exampleClass.getSimpleName() + UUID.randomUUID();
diff --git a/pregelix/pregelix-example/src/main/java/edu/uci/ics/pregelix/example/client/Client.java b/pregelix/pregelix-example/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
index b02ce03..53af127 100644
--- a/pregelix/pregelix-example/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
+++ b/pregelix/pregelix-example/src/main/java/edu/uci/ics/pregelix/example/client/Client.java
@@ -43,11 +43,11 @@
@Option(name = "-ip", usage = "ip address of cluster controller", required = true)
public String ipAddress;
- @Option(name = "-port", usage = "port of cluster controller", required = true)
+ @Option(name = "-port", usage = "port of cluster controller", required = false)
public int port;
- @Option(name = "-plan", usage = "query plan choice", required = true)
- public Plan planChoice;
+ @Option(name = "-plan", usage = "query plan choice", required = false)
+ public Plan planChoice = Plan.OUTER_JOIN;
@Option(name = "-vnum", usage = "number of vertices", required = false)
public long numVertices;